summaryrefslogtreecommitdiff
path: root/extension
diff options
context:
space:
mode:
Diffstat (limited to 'extension')
-rw-r--r--extension/src/activation/environmentSetup.ts20
1 files changed, 10 insertions, 10 deletions
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 8d9578e8..db457bd2 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -83,23 +83,23 @@ export function getExtensionVersion() {
// Returns whether a server of the current version is already running
async function checkOrKillRunningServer(serverUrl: string): Promise<boolean> {
console.log("Checking if server is old version");
+ const serverRunning = await checkServerRunning(serverUrl);
// Kill the server if it is running an old version
if (fs.existsSync(serverVersionPath())) {
const serverVersion = fs.readFileSync(serverVersionPath(), "utf8");
- if (
- serverVersion === getExtensionVersion() &&
- (await checkServerRunning(serverUrl))
- ) {
+ if (serverVersion === getExtensionVersion() && serverRunning) {
// The current version is already up and running, no need to continue
return true;
}
}
- console.log("Killing old server...");
- try {
- await fkill(":65432");
- } catch (e: any) {
- if (!e.message.includes("Process doesn't exist")) {
- console.log("Failed to kill old server:", e);
+ if (serverRunning) {
+ console.log("Killing old server...");
+ try {
+ await fkill(":65432");
+ } catch (e: any) {
+ if (!e.message.includes("Process doesn't exist")) {
+ console.log("Failed to kill old server:", e);
+ }
}
}
return false;