@nsshunt/stsappframework 3.0.176 → 3.0.177

package/src/socketIoServerHelper.ts

@@ -89,9 +89,9 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
     // Use this middleward to check every incomming connection
     #SetupConnectionMiddleware = (nameSpace: STSSocketIONamespace) => {
         nameSpace.socketionamespace.use((socket, next) => {
-            //console.log(JSON.stringify(socket));
-            //console.log(JSON.stringify(socket.handshake.auth));
-            //console.log(JSON.stringify(socket.handshake.headers));
+            //this.#LogInfoMessage(JSON.stringify(socket));
+            //this.#LogInfoMessage(JSON.stringify(socket.handshake.auth));
+            //this.#LogInfoMessage(JSON.stringify(socket.handshake.headers));
             //if (isValid(socket.request)) {
             const a=5; // for lint purposes
             if (a === 5) {
@@ -105,8 +105,8 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
     // Use this middleware to check very packet being received
     #SetupMessageMiddleware = (socket: STSServerSocket) => {
         socket.use(([event, ...args], next) => {
-            //console.log(JSON.stringify(event));
-            //console.log(JSON.stringify(args));
+            //this.#LogInfoMessage(JSON.stringify(event));
+            //this.#LogInfoMessage(JSON.stringify(args));
             /*
             if (isUnauthorized(event)) {
                 return next(new Error("unauthorized event"));

package/src/stslatencycontroller.ts

@@ -20,7 +20,7 @@ export class STSLatencyController extends STSControllerBase
             };
             return res.status(StatusCodes.OK).send(retVal);
         } catch (error) {
-            console.error(error);
+            this.stsApp.LogErrorMessage(error);
             return res.status(StatusCodes.INTERNAL_SERVER_ERROR).send( { status: StatusCodes.INTERNAL_SERVER_ERROR, error: 'Operation was not successful', detail: error } );
         }
     }

package/src/tcpclient/app.ts

@@ -10,10 +10,12 @@ const options: jayson.TcpClientOptions = {
 
 const client = jayson.client.tls(options);
 
+const LogInfoMessage = (message: any) => console.log(message)
+
 // create a client
 
 // invoke "add"
 client.request('add', [1, 1], function(err: any, response: any) {
     if(err) throw err;
-    console.log(response.result); // 2
+    LogInfoMessage(response.result); // 2
 });

package/src/tcpclient/app2.ts

@@ -11,13 +11,15 @@ const options = {
 
 const done: boolean[] = [];
 
+const LogInfoMessage = (message: any) => console.log(message)
+
 const dosomework = (socket: any, index: number) => {
-    console.log('Connected');
+    LogInfoMessage('Connected');
     socket.write("Hello From Client " + JSON.stringify(socket.address()));
     (async () => {
         for (;;) {
             const msg = `${new Date()}: Hello`;
-            console.log(`sending: [${msg}]`);
+            LogInfoMessage(`sending: [${msg}]`);
             socket.write(msg);
             await Sleep(1000);
             if (done[index]) {
@@ -34,11 +36,11 @@ for (let i=0; i < 6; i++) {
         dosomework(socket1, i);
     });
     socket1.on('close', function(data: any) {
-        console.log(chalk.yellow(`CLOSED: ${socket1.remoteAddress} ${socket1.remotePort}`));
+        LogInfoMessage(chalk.yellow(`CLOSED: ${socket1.remoteAddress} ${socket1.remotePort}`));
         done[i]=true;
     });
     socket1.on('data', function(data: any) {
-        console.log(chalk.yellow(`DATA ${socket1.remoteAddress} ${socket1.remotePort} ${data}`));
+        LogInfoMessage(chalk.yellow(`DATA ${socket1.remoteAddress} ${socket1.remotePort} ${data}`));
     });
 }
 
@@ -48,9 +50,9 @@ socket2.on('secureConnect', () => {
   dosomework(socket2);
 });
 socket2.on('close', function(data: any) {
-  console.log(chalk.green(`CLOSED: ${socket2.remoteAddress} ${socket2.remotePort}`));
+  LogInfoMessage(chalk.green(`CLOSED: ${socket2.remoteAddress} ${socket2.remotePort}`));
 });
 socket2.on('data', function(data: any) {
-  console.log(chalk.green(`DATA ${socket2.remoteAddress} ${socket2.remotePort} ${data}`));
+  LogInfoMessage(chalk.green(`DATA ${socket2.remoteAddress} ${socket2.remotePort} ${data}`));
 });
 */

package/src/tcpserver/appConfig.ts

@@ -5,6 +5,8 @@ const goptions = $Options()
 
 import { ProcessOptions, STSServerType } from '../index'
 
+import winston from 'winston'
+
 /*
 // nid: `${goptions.rest01servicename} @ ${goptions.rest01serviceversion}  |  ${this.options.globalServiceData.serviceInstanceId} @ ${os.hostname()}   ^   ${process.pid} @ ${(cluster.isMaster ? process.pid : process.ppid)}`,
 //                        <serviceId>                                                                 <serviceInstanceId>                                                       <serviceInstanceProcessId>
@@ -24,6 +26,22 @@ ${process.pid}${ModelDelimeter.COMPONENT_SEPERATOR}${(isMaster ? process.pid : p
 */
 
 export function ServiceConfigOptions(clusterMode: boolean, isMaster: boolean): ProcessOptions {
+    winston.format.combine(
+        winston.format.colorize(),
+        winston.format.simple()
+    );
+
+    const logger = winston.createLogger({
+        level: 'silly',
+        format: winston.format.combine(
+            winston.format.colorize(),
+            winston.format.simple()
+        ),
+        transports: [
+            new winston.transports.Console()
+        ]
+    });
+
     if (isMaster === true) {
         const serviceInstanceId = uuidv4();
         const data: ProcessOptions = {
@@ -55,11 +73,14 @@ export function ServiceConfigOptions(clusterMode: boolean, isMaster: boolean): P
             instrumentationObservationInterval: goptions.instrumentationObservationInterval,
             instrumentationTimeWindow: goptions.instrumentationTimeWindow,
 
-            useRedisAdaptor: false
+            useRedisAdaptor: false,
+
+            logger: logger
         }
         return data;
     } else {
         const data: ProcessOptions = JSON.parse(process.env['STS_GSD_SII'] as string) as ProcessOptions;
+        data.logger = logger;
         return data;
     }
 }

package/src/tcpserver/appmaster.ts

@@ -95,6 +95,14 @@ export class AppMaster extends MasterProcessBase
         this.#heartBeatTimeout = 750; //@@ config - also must be smaller than electionTimeout
     }
 
+    #LogErrorMessage(message: any) {
+        this.options.logger.error(message);
+    }
+
+    #LogInfoMessage(message: any) {
+        this.options.logger.error(message);
+    }
+
     #GetTLSOptions = (): JSONObject => {
         return {
             key: fs.readFileSync(this.options.httpsServerKeyPath),
@@ -103,14 +111,14 @@ export class AppMaster extends MasterProcessBase
     }
 
     #SetupRPCServer = async (socket: net.Socket): Promise<void> => {
-        console.log('CONNECTED: ' + socket.remoteAddress + ':' + socket.remotePort + ' ' + process.pid);
+        this.#LogInfoMessage('CONNECTED: ' + socket.remoteAddress + ':' + socket.remotePort + ' ' + process.pid);
 
-        socket.on('close', function(data: any) {
-            console.log('CLOSED: ' + socket.remoteAddress + ' ' + socket.remotePort + ' ' + process.pid);
+        socket.on('close', (data: any) => {
+            this.#LogInfoMessage('CLOSED: ' + socket.remoteAddress + ' ' + socket.remotePort + ' ' + process.pid);
         });
 
-        socket.on('data', function(data: any) {
-            console.log('DATA ' + socket.remoteAddress + ': ' + data);
+        socket.on('data', (data: any) => {
+            this.#LogInfoMessage('DATA ' + socket.remoteAddress + ': ' + data);
         });
     }
 
@@ -124,7 +132,7 @@ export class AppMaster extends MasterProcessBase
         // Update my currentTerm
         this.#currentTerm = term;
         // Return my yes vote
-        console.log(chalk.green(`${message} - Vote Yes`));
+        this.#LogInfoMessage(chalk.green(`${message} - Vote Yes`));
         callback(null, true); // YES vote
     }
 
@@ -132,7 +140,7 @@ export class AppMaster extends MasterProcessBase
         // Log the fact that I have now voted for this currentTerm
         this.#votedLog[term] = true;
         // Return my yes vote
-        console.log(chalk.yellow(`${message} - Vote No`));
+        this.#LogInfoMessage(chalk.yellow(`${message} - Vote No`));
         callback(null, false); // NO vote
     }
 
@@ -230,20 +238,20 @@ export class AppMaster extends MasterProcessBase
             if (this.#RAFTState.localeCompare(AppMasterRAFTState.CANDIDATE) === 0) {
                 const retVal = this.#CheckMoreRecentTerm(term, lastLogItemTerm, lastLogItemIndex);
                 if (retVal.retVal === true) {
-                    console.log(`${retVal.msg}`);
-                    console.log(chalk.magenta(`${this.#GetLogPrefix()}: New leader detected, Host: [${host}], Port: [${port}], while in CANDIDATE mode, reverting to FOLLOWER.`));
+                    this.#LogInfoMessage(`${retVal.msg}`);
+                    this.#LogInfoMessage(chalk.magenta(`${this.#GetLogPrefix()}: New leader detected, Host: [${host}], Port: [${port}], while in CANDIDATE mode, reverting to FOLLOWER.`));
                     // This sending node is the leader so revert to follower
                     this.#currentTerm = term;
                     this.#ChangeState(AppMasterRAFTState.FOLLOWER);
                 } else {
-                    console.log(`${retVal.msg}`);
-                    console.log(chalk.magenta(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}].`));
+                    this.#LogInfoMessage(`${retVal.msg}`);
+                    this.#LogInfoMessage(chalk.magenta(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}].`));
                     // Reject this RPC and continue in the CANDIDATE state
                     callback(null, false);
                     return;
                 }
             } else if (this.#RAFTState.localeCompare(AppMasterRAFTState.LEADER) === 0) {
-                console.log(chalk.red(`${this.#GetLogPrefix()}: appendEntry called while I am the current leader, rejecting RPC call.`));
+                this.#LogInfoMessage(chalk.red(`${this.#GetLogPrefix()}: appendEntry called while I am the current leader, rejecting RPC call.`));
                 // Reject this RPC and continue in the LEADER state
                 callback(null, false);
                 return;
@@ -255,12 +263,12 @@ export class AppMaster extends MasterProcessBase
                 const retVal = this.#CheckMoreRecentTerm(term, lastLogItemTerm, lastLogItemIndex);
                 if (retVal.retVal === true) {
                     if (term > this.#currentTerm) {
-                        console.log(chalk.cyan(`${retVal.msg}`));
+                        this.#LogInfoMessage(chalk.cyan(`${retVal.msg}`));
                         this.#currentTerm = term;
                     }
                 } else {
-                    console.log(`${retVal.msg}`);
-                    console.log(chalk.magenta(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}].`));
+                    this.#LogInfoMessage(`${retVal.msg}`);
+                    this.#LogInfoMessage(chalk.magenta(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}].`));
                     // Reject this RPC and continue in the CANDIDATE state
                     callback(null, false);
                     return;
@@ -272,13 +280,13 @@ export class AppMaster extends MasterProcessBase
                 if (sentLeaderService) {
                     if (sentLeaderService.host.localeCompare(this.#leaderNode.host) !== 0 || sentLeaderService.port !== this.#leaderNode.port) {
                         this.#leaderNode = sentLeaderService;
-                        console.log(chalk.white(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`));
+                        this.#LogInfoMessage(chalk.white(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`));
                     }
                 }
             } else {
                 this.#leaderNode = this.#FindService(host, port);
                 if (this.#leaderNode) {
-                    console.log(chalk.white(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`));
+                    this.#LogInfoMessage(chalk.white(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`));
                 }
             }
 
@@ -286,9 +294,9 @@ export class AppMaster extends MasterProcessBase
             callback(null, true);
         });
 
-        jaysonServer.method("ping", async function(args: any, callback: any) {
+        jaysonServer.method("ping", async (args: any, callback: any) => {
             // do something, do nothing
-            console.log('server got ping');
+            this.#LogInfoMessage('server got ping');
             callback();
         });
 
@@ -296,7 +304,7 @@ export class AppMaster extends MasterProcessBase
         //(server as tls.Server).on('secureConnection', this.#SetupRPCServer);
         //server.listen(this.options.listenPort, () => { // 'stscore.stsmda.org'
         server.listen(this.#serverPort, () => { // 'stscore.stsmda.org'
-            console.log('JSON RPC 2.0 Server is running on port ' + this.options.listenPort + '.');
+            this.#LogInfoMessage('JSON RPC 2.0 Server is running on port ' + this.options.listenPort + '.');
         }).on('listening', () =>
         {
             this.LogEx(`JSON RPC 2.0 live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
@@ -325,7 +333,7 @@ export class AppMaster extends MasterProcessBase
 
         client.request('vote', [ this.#currentTerm, lastLogItem.term, lastLogItem.index ], (error: any, response: any) => {
             if (error) { 
-                //console.log(chalk.red(`vote attempt fail: [${JSON.stringify(options)}: ${error}]`));
+                //this.#LogInfoMessage(chalk.red(`vote attempt fail: [${JSON.stringify(options)}: ${error}]`));
             } else {
                 // Log the result
                 if (response.result === true) {
@@ -357,7 +365,7 @@ export class AppMaster extends MasterProcessBase
 
         client.request('appendEntry', [ this.#thisService.host, this.#thisService.port, this.#currentTerm, lastLogItem.term, lastLogItem.index ], (error: any, response: any) => {
             if (error) { 
-                //console.log(chalk.red(`appendEntry attempt fail: [${JSON.stringify(options)}: ${error}]`));
+                //this.#LogInfoMessage(chalk.red(`appendEntry attempt fail: [${JSON.stringify(options)}: ${error}]`));
             } else {
                 this.#appendedEntries[this.#GetServiceKey(service)] = 1;
                 // Log the result
@@ -409,14 +417,14 @@ export class AppMaster extends MasterProcessBase
             if (majority) {
                 this.#StartAppendEntries();
             } else {
-                console.log(chalk.red(`${this.#GetLogPrefix()}: Not enough response for valid cluster state.`));
+                this.#LogInfoMessage(chalk.red(`${this.#GetLogPrefix()}: Not enough response for valid cluster state.`));
             }
         }, this.#heartBeatTimeout);
     }
 
     #Promote = () => {
         this.#ChangeState(AppMasterRAFTState.LEADER);
-        console.log(chalk.green(`${this.#GetLogPrefix()}: New LEADER is elected: [${this.#GetSelfServiceKey()}]`));
+        this.#LogInfoMessage(chalk.green(`${this.#GetLogPrefix()}: New LEADER is elected: [${this.#GetSelfServiceKey()}]`));
         // As leader, now start the regular pings
         this.#StartAppendEntries();
     }
@@ -435,7 +443,7 @@ export class AppMaster extends MasterProcessBase
         const requiredVotes = Math.floor(this.#services.length / 2) + 1;
 
         if (requiredVotes !== this.#lastRequiredVotes || votes !== this.#lastVotes) {
-            console.log(chalk.cyan(`${this.#GetLogPrefix()}votes: [${votes} need: [${requiredVotes}]`));
+            this.#LogInfoMessage(chalk.cyan(`${this.#GetLogPrefix()}votes: [${votes} need: [${requiredVotes}]`));
             this.#lastRequiredVotes = requiredVotes;
             this.#lastVotes = votes;
         }
@@ -448,7 +456,7 @@ export class AppMaster extends MasterProcessBase
         // Get the election timeout going again
         this.#StartElectionTimeout();
 
-        console.log(chalk.yellow(`${this.#GetLogPrefix()}: Start CANDIDATE vote`));
+        this.#LogInfoMessage(chalk.yellow(`${this.#GetLogPrefix()}: Start CANDIDATE vote`));
         // Start in the CANDIDATE state
         this.#ChangeState(AppMasterRAFTState.CANDIDATE);
         // Reset votes
@@ -470,7 +478,7 @@ export class AppMaster extends MasterProcessBase
                 // Log the result - Vote for myself
                 this.#votes[this.#GetSelfServiceKey()] = 1;
                 // Return my yes vote
-                console.log(chalk.green(`${this.#GetLogPrefix()}: SELF VOTE: canidate currentTerm: [${this.#currentTerm}], vote YES`));
+                this.#LogInfoMessage(chalk.green(`${this.#GetLogPrefix()}: SELF VOTE: canidate currentTerm: [${this.#currentTerm}], vote YES`));
                 this.#CheckMajority();
             } else {
                 // Send vote request

package/src/testing/app.ts

@@ -12,6 +12,8 @@ const pid = 523552
 
 const filePath = `/proc/${pid}/net/dev`;
 
+const LogInfoMessage = (message: any) => console.log(message)
+const LogErrorMessage = (message: any) => console.error(message)
 /*
 async function testError() {
     throw new Error('some error')
@@ -21,7 +23,7 @@ async function testtheerror() {
     try {
         await testError();
     } catch (error) {
-        console.error(`Error2: [${error}]`);
+        this.#LogErrorMessage(`Error2: [${error}]`);
     }
 }
 
@@ -31,14 +33,14 @@ async function testtheerror2(cb: (error: any) => void) {
         cb('some error');
         
     } catch (error) {
-        console.error(`Error2: [${error}]`);
+        this.#LogErrorMessage(`Error2: [${error}]`);
     }
 }
 
 (async () => {
     await Sleep(1000);
-    let z = await testtheerror2((error) => console.log(error));
-    console.log(`done.....`);
+    let z = await testtheerror2((error) => this.#LogInfoMessage(error));
+    this.#LogInfoMessage(`done.....`);
 
     process.exit(0);
 })();
@@ -55,7 +57,7 @@ function getNetworkUsage() {
         const headers2 = lines[1].split('|').map(header => header.trim());
         const data = lines[2].split('|').map(value => value.trim());
   
-        console.log(data);
+        LogInfoMessage(data);
 
         // Find the index of the relevant network statistics (e.g., bytes received and transmitted)
         //const rxIndex = headers.indexOf('Receive');
@@ -63,12 +65,12 @@ function getNetworkUsage() {
   
         // Display network usage information
         /*
-      console.log(`Network Usage for Process ${pid}:`);
-      console.log(`   Incoming: ${data[rxIndex]} bytes`);
-      console.log(`   Outgoing: ${data[txIndex]} bytes`);
+      this.#LogInfoMessage(`Network Usage for Process ${pid}:`);
+      this.#LogInfoMessage(`   Incoming: ${data[rxIndex]} bytes`);
+      this.#LogInfoMessage(`   Outgoing: ${data[txIndex]} bytes`);
       */
-    } catch (err) {
-        console.error('Error reading file:', err);
+    } catch (error) {
+        LogErrorMessage(`Error reading file: [${error}]`);
     }
 }
 
@@ -78,13 +80,13 @@ if (cluster.isPrimary) {
     setInterval(function() {
         /*
         si.networkStats().then(data => {
-            console.log(data);
+            this.#LogInfoMessage(data);
         });
         */
 
         getNetworkUsage()
 
-        //console.log(process.pid)
+        //this.#LogInfoMessage(process.pid)
 
         //getNetworkUsage()
 

package/src/testing/appConfig.ts

@@ -8,6 +8,8 @@ import { ProcessOptions, IProcessBase, STSServerType } from './..'
 
 import { STSExpressRouteFactory } from './server'
 
+import winston from 'winston'
+
 /*
 // nid: `${goptions.rest01servicename} @ ${goptions.rest01serviceversion}  |  ${this.options.globalServiceData.serviceInstanceId} @ ${os.hostname()}   ^   ${process.pid} @ ${(cluster.isMaster ? process.pid : process.ppid)}`,
 //                        <serviceId>                                                                 <serviceInstanceId>                                                       <serviceInstanceProcessId>
@@ -27,6 +29,22 @@ ${process.pid}${ModelDelimeter.COMPONENT_SEPERATOR}${(isMaster ? process.pid : p
 */
 
 export function ServiceConfigOptions(clusterMode: boolean, isMaster: boolean): ProcessOptions {
+    winston.format.combine(
+        winston.format.colorize(),
+        winston.format.simple()
+    );
+
+    const logger = winston.createLogger({
+        level: 'silly',
+        format: winston.format.combine(
+            winston.format.colorize(),
+            winston.format.simple()
+        ),
+        transports: [
+            new winston.transports.Console()
+        ]
+    });
+
     if (isMaster === true) {
         const serviceInstanceId = uuidv4();
         const data: ProcessOptions = {
@@ -56,7 +74,9 @@ export function ServiceConfigOptions(clusterMode: boolean, isMaster: boolean): P
             instrumentationTimeWindow: goptions.instrumentationTimeWindow,
 
             useRedisAdaptor: false,
-            workerExec: './dist/testing/app.js'
+            workerExec: './dist/testing/app.js',
+
+            logger: logger
         }
 
         if (!clusterMode) {
@@ -71,6 +91,7 @@ export function ServiceConfigOptions(clusterMode: boolean, isMaster: boolean): P
         data.expressServerRouteFactory = (app: express.Express, stsApp: IProcessBase) => {
             return new STSExpressRouteFactory(app, stsApp);
         }
+        data.logger = logger;
         return data;
     }
 }

package/src/testing/appWorkerWSS.ts

@@ -3,7 +3,7 @@ import cluster from 'node:cluster';
 
 import chalk from 'chalk';
 
-import { WorkerProcessBase, STSNamespace, STSRoom, SocketIoServerHelper, STSSocketIONamespace } from './../index'
+import { WorkerProcessBase, STSNamespace, STSRoom, SocketIoServerHelper, STSSocketIONamespace, ProcessOptions } from './../index'
 
 //import { Socket, Namespace } from "socket.io";
 import { Socket } from "socket.io";
@@ -39,7 +39,7 @@ export class WorkerProcess extends WorkerProcessBase
 {
     #terminate = false;
 
-    constructor(options: any)
+    constructor(options: ProcessOptions)
     {
         super(options);
 
@@ -52,18 +52,26 @@ export class WorkerProcess extends WorkerProcessBase
         });
     }
 
+    #LogErrorMessage(message: any) {
+        this.options.logger.error(message);
+    }
+
+    #LogInfoMessage(message: any) {
+        this.options.logger.info(message);
+    }
+
     // eslint-disable-next-line  @typescript-eslint/no-explicit-any
     ReceivedMessageFromMaster = async (messageData: any) => {
         // Only response to these message types (note should be part of generic pub/sub pattern in framework)
         if (messageData.subCommand) {
             if (messageData.subCommand.localeCompare(InstrumentManagerSubCommand.OUTPUT_SUBSCRIPTION) === 0) {
-                //console.log(chalk.gray(`WorkerProcess.ReceivedMessageFromMaster: messageData: [${JSON.stringify(messageData)}]`));
-                console.log(chalk.gray(`WorkerProcess.ReceivedMessageFromMaster`));
+                //this.#LogInfoMessage(chalk.gray(`WorkerProcess.ReceivedMessageFromMaster: messageData: [${JSON.stringify(messageData)}]`));
+                this.#LogInfoMessage(chalk.gray(`WorkerProcess.ReceivedMessageFromMaster`));
                 const { socketId, workerId } = messageData; //@@ type
 
                 if (cluster.worker && cluster.worker.id !== workerId) {
                     // Invalid data - this workerId must match
-                    console.log(chalk.red(`WorkerProcess.ReceivedMessageFromMaster: Invalid workerId: [${workerId}]. Should have been: [${cluster.worker.id}].`));
+                    this.#LogInfoMessage(chalk.red(`WorkerProcess.ReceivedMessageFromMaster: Invalid workerId: [${workerId}]. Should have been: [${cluster.worker.id}].`));
                 } else {
                     const workerProcess: WorkerProcess = this as WorkerProcess;
                     if (workerProcess.stsMonitorNamespace !== null) {
@@ -71,16 +79,16 @@ export class WorkerProcess extends WorkerProcessBase
                         const sockets = await stsMonitorNamespace.fetchSockets();
                         for (const socket of sockets) {
                             if (socket.id.localeCompare(socketId) === 0) {
-                                console.log(chalk.green(`WorkerProcess.ReceivedMessageFromMaster: Sending payload to subscribed client.`));
+                                this.#LogInfoMessage(chalk.green(`WorkerProcess.ReceivedMessageFromMaster: Sending payload to subscribed client.`));
                                 // eslint-disable-next-line  @typescript-eslint/no-explicit-any
                                 //socket.emit(STSEvent.STSSubInstrumentData as any, model);
                                 return;
                             }
                         }
-                        console.log(chalk.red(`WorkerProcess.ReceivedMessageFromMaster: Invalid socketId. Expecting socket to existing in socket namespace collection.`));
+                        this.#LogInfoMessage(chalk.red(`WorkerProcess.ReceivedMessageFromMaster: Invalid socketId. Expecting socket to existing in socket namespace collection.`));
                         // Invalid - could not find matching socketid to send to
                     } else {
-                        console.log(chalk.red(`WorkerProcess.ReceivedMessageFromMaster: Invalid workerProcess.stsMonitorNamespace is null. Expecting non-null value.`));
+                        this.#LogInfoMessage(chalk.red(`WorkerProcess.ReceivedMessageFromMaster: Invalid workerProcess.stsMonitorNamespace is null. Expecting non-null value.`));
                     }
                 }
             }
@@ -90,22 +98,22 @@ export class WorkerProcess extends WorkerProcessBase
     #SendIPCMessageToMaster(socket: Socket, eventName: any, data: any): void {
         try {
             if (cluster.worker) {
-                console.log(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster: eventName: [${eventName}]`));
+                this.#LogInfoMessage(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster: eventName: [${eventName}]`));
                 const payload: IIPCSocketMessage = {
                     socketId: socket.id,
                     workerId: cluster.worker.id,
                     data: data
                 }
-                //console.log(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster: payload: [${JSON.stringify(payload)}]`));
-                console.log(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster`));
+                //this.#LogInfoMessage(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster: payload: [${JSON.stringify(payload)}]`));
+                this.#LogInfoMessage(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster`));
                 (process as any).send( { command: eventName, payload }, null, { swallowErrors: true }, (error: any) => {
                     if (error) {
-                        console.error(chalk.red(`Error with WorkerProcess:SendIPCMessageToMaster(1): [${error}]`));
+                        this.#LogErrorMessage(chalk.red(`Error with WorkerProcess:SendIPCMessageToMaster(1): [${error}]`));
                     }
                 });
             }
         } catch (error) {
-            console.error(chalk.red(`Error with WorkerProcess:SendIPCMessageToMaster(2): [${error}]`));
+            this.#LogErrorMessage(chalk.red(`Error with WorkerProcess:SendIPCMessageToMaster(2): [${error}]`));
         }
     }
 
@@ -125,7 +133,7 @@ export class WorkerProcess extends WorkerProcessBase
 
                 // Connect call back when a client connects
                 (socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => {
-                    console.log(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster: Id: [${socket.id}] eventName: [${InstrumentManagerEventName.CONNECT}]`));
+                    this.#LogInfoMessage(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster: Id: [${socket.id}] eventName: [${InstrumentManagerEventName.CONNECT}]`));
                 },
 
                 // Custom client to server events

package/src/testing/appsolo.ts

@@ -9,10 +9,13 @@ const oldResRx: number[] = []
 const newResRx: number[] = []
 const newResTx: number[] = []
 
+const LogInfoMessage = (message: any) => console.log(message)
+const LogErrorMessage = (message: any) => console.error(message)
+
 function getNetworkUsage(pidArray: number[]) {
     try {
 
-        console.log(chalk.white.bgCyan.bold('Hello World'));
+        LogInfoMessage(chalk.white.bgCyan.bold('Hello World'));
 
         for (let i=0; i < pidArray.length; i++) {
 
@@ -28,7 +31,7 @@ function getNetworkUsage(pidArray: number[]) {
             const lines = content.trim().split('\n');
 
 
-            //console.log(lines[3]);
+            //this.#LogInfoMessage(lines[3]);
 
 
             const headers1 = lines[0].split('|').map(header => header.trim());
@@ -42,19 +45,19 @@ function getNetworkUsage(pidArray: number[]) {
 
             const result = mystr.replace(/\s+/g, ' ').trim().split(' ');
 
-            //console.log(`${result}`);
+            //this.#LogInfoMessage(`${result}`);
 
             newResRx[i] = parseFloat(result[0]);
             newResTx[i] = parseFloat(result[8]);
 
-            console.log(`${pid} ${i}: ${newResRx[i]} ${newResTx[i]}    :    ${(newResRx[i] - oldResRx[i])/1000000.0}    ${(newResTx[i] - oldResTx[i])/1000000.0}`);
+            LogInfoMessage(`${pid} ${i}: ${newResRx[i]} ${newResTx[i]}    :    ${(newResRx[i] - oldResRx[i])/1000000.0}    ${(newResTx[i] - oldResTx[i])/1000000.0}`);
 
             oldResTx[i] = newResTx[i];
             oldResRx[i] = newResRx[i];
 
-            //console.log(uint8Array);
+            //this.#LogInfoMessage(uint8Array);
       
-            //console.log(data2[1].split('\t'));
+            //this.#LogInfoMessage(data2[1].split('\t'));
 
             // Find the index of the relevant network statistics (e.g., bytes received and transmitted)
             //const rxIndex = headers.indexOf('Receive');
@@ -63,26 +66,26 @@ function getNetworkUsage(pidArray: number[]) {
 
             // Display network usage information
             /*
-      console.log(`Network Usage for Process ${pid}:`);
-      console.log(`   Incoming: ${data[rxIndex]} bytes`);
-      console.log(`   Outgoing: ${data[txIndex]} bytes`);
+      this.#LogInfoMessage(`Network Usage for Process ${pid}:`);
+      this.#LogInfoMessage(`   Incoming: ${data[rxIndex]} bytes`);
+      this.#LogInfoMessage(`   Outgoing: ${data[txIndex]} bytes`);
       */
         }
-    } catch (err) {
-        console.error('Error reading file:', err);
+    } catch (error) {
+        LogErrorMessage(`Error reading file: [${error}]`);
     }
 }
 
 setInterval(function() {
     /*
         si.networkStats().then(data => {
-            console.log(data);
+            this.#LogInfoMessage(data);
         });
         */
 
     getNetworkUsage([ 523493, 523552, 523553, 523554]);
 
-    //console.log(process.pid)
+    //this.#LogInfoMessage(process.pid)
 
     //getNetworkUsage()