diff options
| author | Nate Sesti <sestinj@gmail.com> | 2023-07-11 11:48:43 -0700 |
|---|---|---|
| committer | Nate Sesti <sestinj@gmail.com> | 2023-07-11 11:48:43 -0700 |
| commit | 84910d445f44f8de1f160ff81e06c4eaf9c17ee7 (patch) | |
| tree | b073876c875588cff7dac94bba9b8d8931167476 /extension/src/activation/environmentSetup.ts | |
| parent | 53fe4afedb4d9b89dce0c3c3934d69a606fa8535 (diff) | |
| download | sncontinue-84910d445f44f8de1f160ff81e06c4eaf9c17ee7.tar.gz sncontinue-84910d445f44f8de1f160ff81e06c4eaf9c17ee7.tar.bz2 sncontinue-84910d445f44f8de1f160ff81e06c4eaf9c17ee7.zip | |
air on the side of killing server
Diffstat (limited to 'extension/src/activation/environmentSetup.ts')
| -rw-r--r-- | extension/src/activation/environmentSetup.ts | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts index 02118501..ff8d3158 100644 --- a/extension/src/activation/environmentSetup.ts +++ b/extension/src/activation/environmentSetup.ts @@ -366,24 +366,26 @@ export async function startContinuePythonServer() { setupServerPath(); return await retryThenFail(async () => { - if (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()) { - return; - } - } - console.log("Killing old server..."); - try { - await fkill(":65432"); - } catch (e) { - console.log( - "Failed to kill old server, likely because it didn't exist:", - e - ); + // 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)) + ) { + // The current version is already up and running, no need to continue + return; } } + console.log("Killing old server..."); + try { + await fkill(":65432"); + } catch (e) { + console.log( + "Failed to kill old server, likely because it didn't exist:", + e + ); + } // Do this after above check so we don't have to waste time setting up the env await setupPythonEnv(); |