From 9be91c22bd0db3d8b66e0607f0e86f259a599c0c Mon Sep 17 00:00:00 2001 From: legop3 Date: Wed, 29 Apr 2026 14:47:17 -0400 Subject: [PATCH] snaofhdskljfs --- server/install_server.sh | 4 +--- server/src/services/healthService/index.js | 5 ++--- server/src/services/roverSnapshotService/poller.js | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/server/install_server.sh b/server/install_server.sh index 22e547c4..60dde975 100755 --- a/server/install_server.sh +++ b/server/install_server.sh @@ -8,7 +8,7 @@ MEDIAMTX_CONF_DIR="/etc/mediamtx" MEDIAMTX_CONFIG="$MEDIAMTX_CONF_DIR/mediamtx.yml" MEDIAMTX_SERVICE="/etc/systemd/system/mediamtx.service" MULTIROVER_SERVICE="/etc/systemd/system/multirover.service" -SNAPSHOT_DIR="/var/lib/rover-snapshots" +SNAPSHOT_DIR="$SERVER_DIR/data/rover-snapshots" REPLAY_SEGMENT_DIR="/var/lib/replay-segments" if [[ $EUID -ne 0 ]]; then @@ -90,7 +90,6 @@ Wants=network-online.target User=$TARGET_USER Group=$TARGET_USER WorkingDirectory=$MEDIAMTX_CONF_DIR -Environment=ROVER_SNAPSHOT_DIR=$SNAPSHOT_DIR ExecStart=$MEDIAMTX_BIN $MEDIAMTX_CONFIG Restart=on-failure RestartSec=2 @@ -111,7 +110,6 @@ Group=$TARGET_USER WorkingDirectory=$SERVER_DIR Environment=NODE_ENV=production Environment=SERVER_CONFIG=$CONFIG_PATH -Environment=ROVER_SNAPSHOT_DIR=$SNAPSHOT_DIR Environment=REPLAY_SEGMENT_DIR=$REPLAY_SEGMENT_DIR ExecStart=$NODE_BIN $SERVER_DIR/index.js Restart=on-failure diff --git a/server/src/services/healthService/index.js b/server/src/services/healthService/index.js index b75ac044..9bf9f3f1 100644 --- a/server/src/services/healthService/index.js +++ b/server/src/services/healthService/index.js @@ -7,9 +7,8 @@ const roverManager = require('../roverManager'); const { getRoomCameras } = require('../roomCameraService'); const { getRoomCameraState } = require('../roomCameraService'); const { getReplayHealthSnapshot } = require('../replayEngineV2'); -const { resolveDataDir } = require('../../helpers/dataPaths'); -const ROVER_SNAPSHOT_DIR = path.join(resolveDataDir(), 'rover-snapshots'); +const SNAPSHOT_DIR = path.resolve(__dirname, '..', '..', 'data', 'rover-snapshots'); const HEALTH_INTERVAL_MS = 5000; const ROOM_CAMERA_STALE_MS = 5000; const ROVER_SNAPSHOT_STALE_MS = 5000; @@ -31,7 +30,7 @@ async function collectSnapshotHealth(now) { })); const roverSnapshots = []; for (const rover of rovers) { - const filePath = path.join(ROVER_SNAPSHOT_DIR, `${rover.id}.jpg`); + const filePath = path.join(SNAPSHOT_DIR, `${rover.id}.jpg`); let exists = false; let size = 0; let updatedAt = null; diff --git a/server/src/services/roverSnapshotService/poller.js b/server/src/services/roverSnapshotService/poller.js index 7ca826fd..70f99b8e 100644 --- a/server/src/services/roverSnapshotService/poller.js +++ b/server/src/services/roverSnapshotService/poller.js @@ -5,9 +5,8 @@ const EventEmitter = require('events'); const fs = require('fs/promises'); const path = require('path'); const logger = require('../../globals/logger').child('roverSnapshot'); -const { resolveDataDir } = require('../../helpers/dataPaths'); -const SNAPSHOT_DIR = path.join(resolveDataDir(), 'rover-snapshots'); +const SNAPSHOT_DIR = path.resolve(__dirname, '..', '..', 'data', 'rover-snapshots'); const POLL_INTERVAL_MS = 300; const roverState = new Map(); const events = new EventEmitter();