rainlance/ntpa
1
0
Fork 0
mirror of https://bitbucket.org/anguist/ntpa synced 2026-10-14 17:31:40 +00:00
Code Releases Activity

Allow peers without org id

Browse Source
This commit is contained in:
rainlance
2016-03-26 22:48:43 +01:00
parent 9aa56ef814
commit 9d60c6d037
7 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ntp.Analyzer.Objects/Peer.cs
+1 -1
View File
@@ -74,7 +74,7 @@ namespace Ntp.Analyzer.Objects
/// </returns> /// </returns>
public override string ToString() public override string ToString()
{ {
return base.ToString() + String.Format("[Peer: Name={0}, Ip={1}, OrgId={2}]", Name, Ip, OrgId); return base.ToString() + String.Format("[Peer: Name={0}, Ip={1}, OrgId={2}]", Name, Ip, OrgId ?? Id);
} }
} }
} }
Ntp.Analyzer.Process/Description/PeerGraphJob.cs
+3 -1
View File
@@ -87,7 +87,9 @@ namespace Ntp.Analyzer.Process.Description
Peer peer = peers.Single(); Peer peer = peers.Single();
PeerGraph graph = new PeerGraph(config, host, peer); PeerGraph graph = new PeerGraph(config, host, peer);
string file = peer.Server.Name.Replace('.', '-') + ".png";
string name = peer.Server != null ? peer.Server.Name : peer.Name;
string file = name.Replace('.', '-') + ".png";
SaveStream(graph, file); SaveStream(graph, file);
} }
Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs
+3 -2
View File
@@ -92,8 +92,9 @@ namespace Ntp.Analyzer.Process.Description
Peer peer = peers.Single(); Peer peer = peers.Single();
GraphPageBuilder builder = new GraphPageBuilder(config, peer, peer.Server.Name, graphSet, graph); string name = peer.Server != null ? peer.Server.Name : peer.Name;
string file = config.GetFileName(host, peer.Server, graphSet, graph); GraphPageBuilder builder = new GraphPageBuilder(config, peer, name, graphSet, graph);
string file = config.GetFileName(host, name, graphSet, graph);
SaveStream(builder, file); SaveStream(builder, file);
} }
Ntp.Analyzer.Process/Description/PeerPageJob.cs
+3 -1
View File
@@ -105,7 +105,9 @@ namespace Ntp.Analyzer.Process.Description
else else
peerPageBuilder = new DefaultPeerPageBuilder(peer, page); peerPageBuilder = new DefaultPeerPageBuilder(peer, page);
SaveStream(peerPageBuilder, peer.OrgId.Value.ToString(CultureInfo.InvariantCulture) + ".html"); string name = peer.OrgId.HasValue ?
peer.OrgId.Value.ToString (CultureInfo.InvariantCulture) : peer.Name;
SaveStream(peerPageBuilder, name + ".html");
} }
} }
} }
Ntp.Analyzer/Config/Page/PeerGraphPageConfiguration.cs
+2 -2
View File
@@ -103,10 +103,10 @@ namespace Ntp.Analyzer.Config.Page
} }
} }
public string GetFileName (Host host, TimeServer peer, GraphSetConfiguration graphSet, GraphBaseConfiguration graph) public string GetFileName (Host host, string name, GraphSetConfiguration graphSet, GraphBaseConfiguration graph)
{ {
return host.Name.Replace ('.', '-') + "_" + return host.Name.Replace ('.', '-') + "_" +
graph.GetAltName (graphSet, peer.Name). graph.GetAltName (graphSet, name).
Replace (".png", String.Empty). Replace (".png", String.Empty).
Replace ('.', '-') Replace ('.', '-')
+ ".html"; + ".html";
Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs
+6 -3
View File
@@ -109,14 +109,17 @@ namespace Ntp.Analyzer.Render.Summery
// TODO: Add links for images. // TODO: Add links for images.
foreach (GraphBaseConfiguration graph in graphSet.Graphs) foreach (GraphBaseConfiguration graph in graphSet.Graphs)
{ {
int id = peer.OrgId ?? peer.Id;
string name = peer.Server != null ? peer.Server.Name : peer.Name;
builder.Append(@" <div class=""container theme-graph2"">"); builder.Append(@" <div class=""container theme-graph2"">");
builder.Append(@"<a href="""); builder.Append(@"<a href=""");
builder.Append(page.GetPeerLink(peer.OrgId.Value)); builder.Append(page.GetPeerLink(id));
builder.Append(@""">"); builder.Append(@""">");
builder.Append(@"<img class=""img-responsive"" src="""); builder.Append(@"<img class=""img-responsive"" src=""");
builder.Append(graph.GetLink(graphSet, peer.Server.Name)); builder.Append(graph.GetLink(graphSet, name));
builder.Append(@""" alt="""); builder.Append(@""" alt=""");
builder.Append(graph.GetAltName(graphSet, peer.Server.Name)); builder.Append(graph.GetAltName(graphSet, name));
builder.Append(@""">"); builder.Append(@""">");
builder.AppendLine(@"</a></div>"); builder.AppendLine(@"</a></div>");
} }
Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs
+6 -3
View File
@@ -77,13 +77,16 @@ namespace Ntp.Analyzer.Render.Summery
{ {
foreach (GraphBaseConfiguration graph in graphSet.Graphs) foreach (GraphBaseConfiguration graph in graphSet.Graphs)
{ {
int id = peer.OrgId ?? peer.Id;
string name = peer.Server != null ? peer.Server.Name : peer.Name;
builder.Append(@"<a href="""); builder.Append(@"<a href=""");
builder.Append(page.GetPeerLink(peer.OrgId.Value)); builder.Append(page.GetPeerLink(id));
builder.Append(@""">"); builder.Append(@""">");
builder.Append(@"<img src="""); builder.Append(@"<img src=""");
builder.Append(graph.GetLink(graphSet, peer.Server.Name)); builder.Append(graph.GetLink(graphSet, name));
builder.Append(@""" alt="""); builder.Append(@""" alt=""");
builder.Append(graph.GetAltName(graphSet, peer.Server.Name)); builder.Append(graph.GetAltName(graphSet, name));
builder.Append(@""">"); builder.Append(@""">");
builder.AppendLine(@"</a>"); builder.AppendLine(@"</a>");
} }