Merge branch 'master' into fix-renamming

PhotonVision · Oct 20, 2023 · d8c5c97 · d8c5c97
2 parents d20d0e9 + 89908fc
commit d8c5c97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/photon-client/src/components/settings/DeviceControlCard.vue b/photon-client/src/components/settings/DeviceControlCard.vue
@@ -308,7 +308,7 @@ const handleSettingsImport = () => {
             <a
               ref="exportLogFile"
               style="color: black; text-decoration: none; display: none"
-              :href="'http://' + address + '/api/utils/logs/photonvision-journalctl.txt'"
+              :href="`http://${address}/api/utils/photonvision-journalctl.txt`"
               download="photonvision-journalctl.txt"
               target="_blank"
             />

diff --git a/photon-server/src/main/java/org/photonvision/server/Server.java b/photon-server/src/main/java/org/photonvision/server/Server.java
@@ -104,7 +104,7 @@ public static void start(int port) {
 
         // Utilities
         app.post("/api/utils/offlineUpdate", RequestHandler::onOfflineUpdateRequest);
-        app.get("/api/utils/logs/photonvision-journalctl.txt", RequestHandler::onLogExportRequest);
+        app.get("/api/utils/photonvision-journalctl.txt", RequestHandler::onLogExportRequest);
         app.post("/api/utils/restartProgram", RequestHandler::onProgramRestartRequest);
         app.post("/api/utils/restartDevice", RequestHandler::onDeviceRestartRequest);
         app.post("/api/utils/publishMetrics", RequestHandler::onMetricsPublishRequest);