Skip to content

Commit 7d2e5f4

Browse files
scpa1055cassava
authored andcommitted
ui: Fix wrong dir in Makefile and remove timeout in webserver
1 parent e9c0a27 commit 7d2e5f4

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

ui/server/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DOCKER_CONTEXT := .
2020

2121
CONTAINER_NAME := cloe-ui-webserver
2222
override DOCKER_RUN_ARGS += -p=4000:4000
23-
MOUNT_DIRECTORY := $$HOME/.local/share/replay_data
23+
MOUNT_DIRECTORY := $$HOME/.local/share/cloe/replay_data
2424
override DOCKER_RUN_ARGS += -v=${MOUNT_DIRECTORY}:/app/replay_data
2525

2626
.PHONY: help

ui/server/server.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,8 @@ app.get("/remote/start-replay", async (req, res) => {
122122
let lastClient = clients[clients.length - 1];
123123
// Before sending data the client needs to setup correctly.
124124
io.to(lastClient).emit("set_replay_environment", {});
125-
getReplayData(req.query.id, req.query.name);
126-
setTimeout(() => {
127-
getPlotData(req.query.id);
128-
}, 1000);
125+
await getReplayData(req.query.id, req.query.name);
126+
getPlotData(req.query.id);
129127
});
130128

131129
// Search and send replay data to client.
@@ -168,6 +166,10 @@ async function getPlotData(query) {
168166
let lastClient = clients[clients.length - 1];
169167
let filePath = path.join(FILEPATHROOT, FILEDIRECTORY, query, query + ".html");
170168
fs.readFile(filePath, "utf8", function(err, data) {
171-
io.to(lastClient).emit("plot_data", data);
169+
if (err) {
170+
console.log(`File not found: ${err}`)
171+
}else {
172+
io.to(lastClient).emit("plot_data", data);
173+
}
172174
});
173175
}

0 commit comments

Comments
 (0)