rainlance/ntpa
1
0
Fork 0
mirror of https://bitbucket.org/anguist/ntpa synced 2026-10-01 07:08:04 +00:00
Code Releases Activity

Removed dependency to org id

Browse Source
This commit is contained in:
rainlance
2016-03-22 21:13:07 +01:00
parent 1438a6553b
commit 606345fa17
6 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ntp.Analyzer.Process/Description/PeerGraphJob.cs
+5 -1
View File
@@ -65,12 +65,16 @@ namespace Ntp.Analyzer.Process.Description
foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[config.ConfigFile]) foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[config.ConfigFile])
{ {
IEnumerable<Peer> peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString()); IEnumerable<Peer> peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString());
if (peers.Count() == 0) if (peers.Count() == 0)
{ {
Log.WriteLine("Peer not found in database: " + entry.Name, Severity.Warn); Log.WriteLine("Peer not found in database: " + entry.Name, Severity.Warn);
continue; continue;
} }
else if (peers.Count() > 1)
{
Log.WriteLine("Ambiguous peer IP. Multiple occurrence found in database: " + entry.Name, Severity.Warn);
continue;
}
Peer peer = peers.Single(); Peer peer = peers.Single();
Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs
+6 -2
View File
@@ -70,13 +70,17 @@ namespace Ntp.Analyzer.Process.Description
{ {
foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[config.ConfigFile]) 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) if (peers.Count() == 0)
{ {
Log.WriteLine("Peer not found in database: " + entry.Name, Severity.Warn); Log.WriteLine("Peer not found in database: " + entry.Name, Severity.Warn);
continue; continue;
} }
else if (peers.Count() > 1)
{
Log.WriteLine("Ambiguous peer IP. Multiple occurrence found in database: " + entry.Name, Severity.Warn);
continue;
}
Peer peer = peers.Single(); Peer peer = peers.Single();
Ntp.Analyzer.Process/Description/PeerPageJob.cs
+2 -3
View File
@@ -71,8 +71,7 @@ namespace Ntp.Analyzer.Process.Description
foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[page.ConfigFile]) foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[page.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) if (peers.Count() == 0)
{ {
Log.WriteLine("Peer not found in database. Creating peer: " + entry.Name, Severity.Warn); Log.WriteLine("Peer not found in database. Creating peer: " + entry.Name, Severity.Warn);
@@ -85,7 +84,7 @@ namespace Ntp.Analyzer.Process.Description
} }
else if (peers.Count() > 1) else if (peers.Count() > 1)
{ {
Log.WriteLine("Ambiguous peer name. Multiple occurrence found in database: " + entry.Name, Severity.Warn); Log.WriteLine("Ambiguous peer IP. Multiple occurrence found in database: " + entry.Name, Severity.Warn);
continue; continue;
} }
Ntp.Analyzer.sln
+1 -1
View File
@@ -169,7 +169,7 @@ Global
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
EndGlobalSection EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Ntp.Analyzer.Validate.Cli\Ntp.Analyzer.Validate.Cli.csproj StartupItem = Ntp.Analyzer.Cli\Ntp.Analyzer.Cli.csproj
Policies = $0 Policies = $0
$0.DotNetNamingPolicy = $1 $0.DotNetNamingPolicy = $1
$1.DirectoryNamespaceAssociation = PrefixedHierarchical $1.DirectoryNamespaceAssociation = PrefixedHierarchical
Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs
+8 -7
View File
@@ -28,11 +28,11 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Ntp.Analyzer.Data;
using Ntp.Analyzer.Objects;
using Ntp.Analyzer.Config.Destination; using Ntp.Analyzer.Config.Destination;
using Ntp.Analyzer.Config.Graph; using Ntp.Analyzer.Config.Graph;
using Ntp.Analyzer.Config.Page; using Ntp.Analyzer.Config.Page;
using Ntp.Analyzer.Data;
using Ntp.Analyzer.Objects;
namespace Ntp.Analyzer.Render.Summery namespace Ntp.Analyzer.Render.Summery
{ {
@@ -96,11 +96,12 @@ namespace Ntp.Analyzer.Render.Summery
foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[page.ConfigFile]) foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[page.ConfigFile])
{ {
IEnumerable<Objects.Peer> peers = DataFace.Instance.Peers.Where(p => p.OrgId == entry.OrgId.Value); IEnumerable<Objects.Peer> peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString());
if (peers.Count () == 0) {
if (peers.Count() == 0) throw new ApplicationException (String.Format (
{ "Peer with IP {0} was not found in database.",
throw new ApplicationException("Peer not found in database: " + entry.Name); entry.Address.ToString ()
));
} }
Objects.Peer peer = peers.Single(); Objects.Peer peer = peers.Single();
Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs
+8 -7
View File
@@ -28,11 +28,11 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Ntp.Analyzer.Data;
using Ntp.Analyzer.Objects;
using Ntp.Analyzer.Config.Destination; using Ntp.Analyzer.Config.Destination;
using Ntp.Analyzer.Config.Graph; using Ntp.Analyzer.Config.Graph;
using Ntp.Analyzer.Config.Page; using Ntp.Analyzer.Config.Page;
using Ntp.Analyzer.Data;
using Ntp.Analyzer.Objects;
namespace Ntp.Analyzer.Render.Summery namespace Ntp.Analyzer.Render.Summery
{ {
@@ -63,11 +63,12 @@ namespace Ntp.Analyzer.Render.Summery
foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[page.ConfigFile]) foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[page.ConfigFile])
{ {
IEnumerable<Objects.Peer> peers = DataFace.Instance.Peers.Where(p => p.OrgId == entry.OrgId.Value); IEnumerable<Objects.Peer> peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString());
if (peers.Count () == 0) {
if (peers.Count() == 0) throw new ApplicationException (String.Format (
{ "Peer with IP {0} was not found in database.",
throw new ApplicationException("Peer not found in database: " + entry.Name); entry.Address.ToString ()
));
} }
Objects.Peer peer = peers.Single(); Objects.Peer peer = peers.Single();