cubetiq/code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Run ssh server listen after http

Browse Source 
That way if they happen to conflict code-server doesn't crash.
This commit is contained in:
Asher 2020-03-30 16:22:24 -05:00
parent 6c104c016e
commit a4c0fd1fdc
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/node/entry.ts
View File

@ -79,17 +79,6 @@ const main = async (args: Args): Promise<void> => {
ipcMain().onDispose(() => httpServer.dispose()) ipcMain().onDispose(() => httpServer.dispose())
logger.info(`code-server ${version} ${commit}`) logger.info(`code-server ${version} ${commit}`)
let sshPort: number | undefined
if (!args["disable-ssh"] && options.sshHostKey) {
const sshProvider = httpServer.registerHttpProvider("/ssh", SshProvider, options.sshHostKey as string)
try {
sshPort = await sshProvider.listen()
} catch (error) {
logger.warn(`SSH server: ${error.message}`)
}
}
const serverAddress = await httpServer.listen() const serverAddress = await httpServer.listen()
logger.info(`HTTP server listening on ${serverAddress}`) logger.info(`HTTP server listening on ${serverAddress}`)
@ -117,6 +106,16 @@ const main = async (args: Args): Promise<void> => {
logger.info(`Automatic updates are ${update.enabled ? "enabled" : "disabled"}`) logger.info(`Automatic updates are ${update.enabled ? "enabled" : "disabled"}`)
let sshPort: number | undefined
if (!args["disable-ssh"] && options.sshHostKey) {
const sshProvider = httpServer.registerHttpProvider("/ssh", SshProvider, options.sshHostKey as string)
try {
sshPort = await sshProvider.listen()
} catch (error) {
logger.warn(`SSH server: ${error.message}`)
}
}
if (typeof sshPort !== "undefined") { if (typeof sshPort !== "undefined") {
logger.info(`SSH server listening on localhost:${sshPort}`) logger.info(`SSH server listening on localhost:${sshPort}`)
} else { } else {