diff options
author | Chocobozzz <me@florianbigard.com> | 2023-05-26 09:03:50 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-05-26 09:04:22 +0200 |
commit | f474a519dc08df47c96ead9e0216912582def4f7 (patch) | |
tree | d92bf1219434ce7415f709ca5e707d1e65e9d6a6 /packages/peertube-runner/server | |
parent | e35967ee084a1cba8ed7bc893209bd69200ca3ca (diff) | |
download | PeerTube-f474a519dc08df47c96ead9e0216912582def4f7.tar.gz PeerTube-f474a519dc08df47c96ead9e0216912582def4f7.tar.zst PeerTube-f474a519dc08df47c96ead9e0216912582def4f7.zip |
Specify runner name when unregistering the runner
Diffstat (limited to 'packages/peertube-runner/server')
-rw-r--r-- | packages/peertube-runner/server/server.ts | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/packages/peertube-runner/server/server.ts b/packages/peertube-runner/server/server.ts index 087405dfe..e76131c74 100644 --- a/packages/peertube-runner/server/server.ts +++ b/packages/peertube-runner/server/server.ts | |||
@@ -121,27 +121,28 @@ export class RunnerServer { | |||
121 | 121 | ||
122 | async unregisterRunner (options: { | 122 | async unregisterRunner (options: { |
123 | url: string | 123 | url: string |
124 | runnerName: string | ||
124 | }) { | 125 | }) { |
125 | const { url } = options | 126 | const { url, runnerName } = options |
126 | 127 | ||
127 | const server = this.servers.find(s => s.url === url) | 128 | const server = this.servers.find(s => s.url === url && s.runnerName === runnerName) |
128 | if (!server) { | 129 | if (!server) { |
129 | logger.error(`Unknown server ${url} to unregister`) | 130 | logger.error(`Unknown server ${url} - ${runnerName} to unregister`) |
130 | return | 131 | return |
131 | } | 132 | } |
132 | 133 | ||
133 | logger.info(`Unregistering runner ${server.runnerName} on ${url}...`) | 134 | logger.info(`Unregistering runner ${runnerName} on ${url}...`) |
134 | 135 | ||
135 | try { | 136 | try { |
136 | await server.runners.unregister({ runnerToken: server.runnerToken }) | 137 | await server.runners.unregister({ runnerToken: server.runnerToken }) |
137 | } catch (err) { | 138 | } catch (err) { |
138 | logger.error({ err }, `Cannot unregister runner ${server.runnerName} on ${url}`) | 139 | logger.error({ err }, `Cannot unregister runner ${runnerName} on ${url}`) |
139 | } | 140 | } |
140 | 141 | ||
141 | this.unloadServer(server) | 142 | this.unloadServer(server) |
142 | await this.saveRegisteredInstancesInConf() | 143 | await this.saveRegisteredInstancesInConf() |
143 | 144 | ||
144 | logger.info(`Unregistered runner ${server.runnerName} on ${server.url}`) | 145 | logger.info(`Unregistered runner ${runnerName} on ${url}`) |
145 | } | 146 | } |
146 | 147 | ||
147 | private unloadServer (server: PeerTubeServer) { | 148 | private unloadServer (server: PeerTubeServer) { |
@@ -195,7 +196,7 @@ export class RunnerServer { | |||
195 | if (code === ServerErrorCode.UNKNOWN_RUNNER_TOKEN) { | 196 | if (code === ServerErrorCode.UNKNOWN_RUNNER_TOKEN) { |
196 | logger.error({ err }, `Unregistering ${server.url} as the runner token ${server.runnerToken} is invalid`) | 197 | logger.error({ err }, `Unregistering ${server.url} as the runner token ${server.runnerToken} is invalid`) |
197 | 198 | ||
198 | await this.unregisterRunner({ url: server.url }) | 199 | await this.unregisterRunner({ url: server.url, runnerName: server.runnerName }) |
199 | return | 200 | return |
200 | } | 201 | } |
201 | 202 | ||