Removed dependency to org id

Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj

@@ -25,7 +25,7 @@
     <LangVersion>4</LangVersion>
     <Externalconsole>true</Externalconsole>
     <DebugSymbols>true</DebugSymbols>
-    <Commandlineparameters>~/code/ntpa/example/ntpa.stat.conf</Commandlineparameters>
+    <Commandlineparameters>--config ~/code/ntpa/example/ntpa.graph.conf --temp /tmp/</Commandlineparameters>
     <AssemblyName>ntpa</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Server|AnyCPU' ">

Ntp.Analyzer.Data/File/NtpConfMapper.cs

@@ -120,17 +120,16 @@ namespace Ntp.Analyzer.Data.File
             if (ip == null) {
                 try {
                     ip = Dns.GetHostAddresses (address) [0];
-                } catch (Exception exception) {
+                } catch (Exception e) {
-                    Debug.WriteLine (exception);
+                    Log.WriteLine (e, Severity.Trace);
-                    return null;
                 }
             } else {
                 try {
                     IPHostEntry hostEntry = Dns.GetHostEntry (ip);
                     name = hostEntry.HostName;
-                } catch (Exception exception) {
+                } catch (Exception e) {
-                    Debug.WriteLine (exception);
+                    Log.WriteLine (e, Severity.Trace);
-                    return null;
+                    name = ip.ToString ();
                 }
             }
 
@@ -139,17 +138,19 @@ namespace Ntp.Analyzer.Data.File
             int orgPos = l.IndexOf ("#", StringComparison.Ordinal);
 
             if (orgPos != -1) {
-                string org = l.Substring (orgPos + 1).Trim ();
+                try {
-                orgPos = org.IndexOf (" ", StringComparison.Ordinal);
+                    string org = l.Substring (orgPos + 1).Trim ();
-                org = org.Substring (0, orgPos).Trim ();
+                    orgPos = org.IndexOf (" ", StringComparison.Ordinal);
+                    org = org.Substring (0, orgPos).Trim ();
 
-                int realOrgId;
+                    int realOrgId;
-
+                    if (Int32.TryParse (org, out realOrgId)) {
-                // Nullable not fully supported by NTP Analyzer.
+                        orgId = realOrgId;
-                if (!Int32.TryParse (org, out realOrgId))
+                    }
-                    return null;
+                } catch {
-
+                    // TODO: Make a more secure implementation
-                orgId = realOrgId;
+                    orgId = null;
+                }
             }
 
             return new NtpConfEntry (role, ip, name, orgId);

Ntp.Analyzer.Process/Description/PeerGraphJob.cs

@@ -64,7 +64,7 @@ namespace Ntp.Analyzer.Process.Description
 
             foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[config.ConfigFile])
             {
-                IEnumerable<Peer> peers = DataFace.Instance.Peers.Where(p => p.OrgId == entry.OrgId.Value);
+                IEnumerable<Peer> peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString());
 
                 if (peers.Count() == 0)
                 {

example/ntpa.graph.conf

@@ -4,9 +4,19 @@
 
 # Connection parameters to MySQL database instance.
 Database {
+	# Address of sql server
 	Host 127.0.0.1
+
+	# Port of sql server. Leave empty to use default.
+	#Port 2567
+
+	# Name of database
 	Name ntpa
+
+	# Database username
 	User ntpau
+
+	# Password for the user
 	Pass xxxx
 }
 
@@ -35,7 +45,7 @@ Server {
 	ConfigFile /opt/ntpa/config/ntp.conf
 	
 	# Base path for generated files
-	FilePath graphs/
+	FilePath /usr/local/www/
 	
 	# Base URL for generated files
 	WebPath /