Merge branch 'master' into copilot/fix-3044

Author: GermanBluefox

packages/db-objects-file/src/lib/objects/objectsInMemServerRedis.js

@@ -80,7 +80,7 @@ export class ObjectsInMemoryServer extends ObjectsInMemoryFileDB {
             .then(() => {
                 this.log.debug(
                     `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-objects listening on port ${
-                        settings.port || 9001
+                        this.settings.connection.port || 9001
                     }`,
                 );
 
@@ -90,7 +90,7 @@ export class ObjectsInMemoryServer extends ObjectsInMemoryFileDB {
             })
             .catch(e => {
                 this.log.error(
-                    `${this.namespace} Cannot start inMem-objects on port ${settings.port || 9001}: ${e.message}`,
+                    `${this.namespace} Cannot start inMem-objects on port ${this.settings.connection.port || 9001}: ${e.message}`,
                 );
                 process.exit(EXIT_CODES.NO_CONNECTION_TO_OBJ_DB);
             });

packages/db-objects-jsonl/src/lib/objects/objectsInMemServerRedis.js

@@ -80,7 +80,7 @@ export class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
             .then(() => {
                 this.log.debug(
                     `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-objects listening on port ${
-                        settings.port || 9001
+                        this.settings.connection.port || 9001
                     }`,
                 );
 
@@ -90,7 +90,7 @@ export class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
             })
             .catch(e => {
                 this.log.error(
-                    `${this.namespace} Cannot start inMem-objects on port ${settings.port || 9001}: ${e.message}`,
+                    `${this.namespace} Cannot start inMem-objects on port ${this.settings.connection.port || 9001}: ${e.message}`,
                 );
                 process.exit(EXIT_CODES.NO_CONNECTION_TO_OBJ_DB);
             });

packages/db-states-file/src/lib/states/statesInMemServerRedis.js

@@ -68,7 +68,7 @@ export class StatesInMemoryServer extends StatesInMemoryFileDB {
             .then(() => {
                 this.log.debug(
                     `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-states listening on port ${
-                        this.settings.port || 9000
+                        this.settings.connection.port || 9000
                     }`,
                 );
 
@@ -78,7 +78,7 @@ export class StatesInMemoryServer extends StatesInMemoryFileDB {
             })
             .catch(e => {
                 this.log.error(
-                    `${this.namespace} Cannot start inMem-states on port ${this.settings.port || 9000}: ${e.message}`,
+                    `${this.namespace} Cannot start inMem-states on port ${this.settings.connection.port || 9000}: ${e.message}`,
                 );
                 process.exit(EXIT_CODES.NO_CONNECTION_TO_STATES_DB);
             });
@@ -534,8 +534,8 @@ export class StatesInMemoryServer extends StatesInMemoryFileDB {
                 this.server = net.createServer();
                 this.server.on('error', err =>
                     this.log.info(
-                        `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-objects listening on port ${
-                            settings.port || 9001
+                        `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-states listening on port ${
+                            settings.port || 9000
                         }: ${err}`,
                     ),
                 );

packages/db-states-jsonl/src/lib/states/statesInMemServerRedis.js

@@ -68,7 +68,7 @@ export class StatesInMemoryServer extends StatesInMemoryJsonlDB {
             .then(() => {
                 this.log.debug(
                     `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-states listening on port ${
-                        this.settings.port || 9000
+                        this.settings.connection.port || 9000
                     }`,
                 );
 
@@ -78,7 +78,7 @@ export class StatesInMemoryServer extends StatesInMemoryJsonlDB {
             })
             .catch(e => {
                 this.log.error(
-                    `${this.namespace} Cannot start inMem-states on port ${this.settings.port || 9000}: ${e.message}`,
+                    `${this.namespace} Cannot start inMem-states on port ${this.settings.connection.port || 9000}: ${e.message}`,
                 );
                 process.exit(EXIT_CODES.NO_CONNECTION_TO_STATES_DB);
             });
@@ -534,8 +534,8 @@ export class StatesInMemoryServer extends StatesInMemoryJsonlDB {
                 this.server = net.createServer();
                 this.server.on('error', err =>
                     this.log.info(
-                        `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-objects listening on port ${
-                            settings.port || 9001
+                        `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-states listening on port ${
+                            settings.port || 9000
                         }: ${err}`,
                     ),
                 );