Skip to content

Commit e2d44e8

Browse files
authored
fix logging of webserver upgrade (#2396)
1 parent b933d1c commit e2d44e8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

packages/controller/src/lib/adapterUpgradeManager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ interface ServerResponse {
5959
}
6060

6161
export class AdapterUpgradeManager {
62-
/** Wait ms until controller is stopped */
62+
/** Wait ms until adapter is stopped */
6363
private readonly STOP_TIMEOUT_MS = 3_000;
6464
/** Wait ms for delivery of final response */
6565
private readonly SHUTDOWN_TIMEOUT = 10_000;
6666
/** Name of the adapter to upgrade */
6767
private readonly adapterName: string;
68-
/** Desired controller version */
68+
/** Desired adapter version */
6969
private readonly version: string;
7070
/** Response send by webserver */
7171
private readonly response: ServerResponse = {
@@ -260,7 +260,7 @@ export class AdapterUpgradeManager {
260260
return;
261261
}
262262

263-
this.logger.info(`host.${this.hostname} [CONTROLLER_AUTO_UPGRADE] ${message}`);
263+
this.logger.info(`host.${this.hostname} [WEBSERVER_UPGRADE] (${this.adapterName}) ${message}`);
264264
this.response.stdout.push(message);
265265
}
266266

packages/controller/src/main.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3185,7 +3185,7 @@ async function processMessage(msg: ioBroker.SendableMessage): Promise<null | voi
31853185
}
31863186

31873187
case 'upgradeAdapterWithWebserver': {
3188-
const { version, adapterName, useHttps, port } = msg.message;
3188+
const { version, adapterName, useHttps, port, certPrivateName, certPublicName } = msg.message;
31893189

31903190
const upgradeManager = new AdapterUpgradeManager({
31913191
logger,
@@ -3195,8 +3195,8 @@ async function processMessage(msg: ioBroker.SendableMessage): Promise<null | voi
31953195
objects: objects!,
31963196
states: states!,
31973197
port,
3198-
certPrivateName: msg.message.certPrivateName,
3199-
certPublicName: msg.message.certPublicName
3198+
certPrivateName,
3199+
certPublicName
32003200
});
32013201

32023202
await upgradeManager.stopAdapter();

0 commit comments

Comments
 (0)