Keep same tab for pages on same site (#184)

Also add some more logging for unusual events Fixes #182 Signed-off-by: Dave Thaler <[email protected]>
orcasound · Oct 30, 2024 · ddbb47d · ddbb47d
1 parent 860358a
commit ddbb47d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/OrcanodeMonitor/Core/Fetcher.cs b/OrcanodeMonitor/Core/Fetcher.cs
@@ -546,6 +546,7 @@ private static void UpdateOrcasoundNode(JsonElement feed, List<Orcanode> foundLi
                     {
                         // We have duplicate nodes to merge. In theory we shouldn't have any
                         // node state for the dataplicity-only node. (TODO: verify this)
+                        logger.LogWarning($"Merging duplicate nodes for {node.DataplicitySerial}");
                         node.DataplicityDescription = dataplicityNode.DataplicityDescription;
                         node.DataplicityName = dataplicityNode.DataplicityName;
                         node.DataplicityOnline = dataplicityNode.DataplicityOnline;

diff --git a/OrcanodeMonitor/Core/MezmoFetcher.cs b/OrcanodeMonitor/Core/MezmoFetcher.cs
@@ -212,7 +212,7 @@ public async static Task UpdateMezmoHostsAsync(OrcanodeMonitorContext context, I
                     Orcanode? oldNode = originalList.Find(a => a.S3NodeName == unfoundNode.S3NodeName);
                     if (oldNode != null)
                     {
-                        logger.LogInformation($"Mezmo node no longer found: {unfoundNode.S3NodeName}");
+                        logger.LogInformation($"Mezmo node not found: {unfoundNode.S3NodeName}");
                         oldNode.MezmoLogSize = 0;
                     }
                 }

diff --git a/OrcanodeMonitor/Pages/Index.cshtml b/OrcanodeMonitor/Pages/Index.cshtml
@@ -32,7 +32,7 @@
                 @Html.DisplayFor(modelItem => item.DisplayName)
             </td>
             <td style="background-color: @Model.NodeDataplicityBackgroundColor(item)">
-                <a asp-page="/DataplicityNode" asp-route-serial="@item.DataplicitySerial" style="color: @Model.NodeDataplicityTextColor(item)" target="_blank">
+                <a asp-page="/DataplicityNode" asp-route-serial="@item.DataplicitySerial" style="color: @Model.NodeDataplicityTextColor(item)">
                     @Html.DisplayFor(modelItem => item.DataplicityConnectionStatus)
                 </a>
             </td>
@@ -72,8 +72,8 @@
                 </td>
             }
             <td style="background-color: @Model.NodeUptimePercentageBackgroundColor(item)">
-                    <a asp-page="/NodeEvents" asp-route-id="@item.ID" style="color: @Model.NodeUptimePercentageTextColor(item)" target="_blank"
-                       aria-label="View events for @item.DisplayName (opens in new tab)">
+                    <a asp-page="/NodeEvents" asp-route-id="@item.ID" style="color: @Model.NodeUptimePercentageTextColor(item)"
+                       aria-label="View events for @item.DisplayName">
                     @Model.GetUptimePercentage(item)%
                 </a>
             </td>