@nsshunt/stsappframework 3.0.176 → 3.0.178

package/src/kafkatesting/consume.ts

@@ -4,10 +4,38 @@ import { TOPIC, GROUP_ID, CLIENT_ID, BROKERS, TIMEOUT } from './config'
 import { KafkaManager } from './../kafka/kafkamanager'
 import { JSONObject } from '@nsshunt/stsutils';
 
+import winston from 'winston'
+
 async function Sleep(milliseconds = 1000) { 
     return new Promise(resolve => setTimeout(resolve, milliseconds))
 }
 
+
+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()
+    ]});
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const LogErrorMessage = (message: any) => {
+    logger.error(message);
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const LogInfoMessage = (message: any) => {
+    logger.info(message);
+}
+
 const km = new KafkaManager({
     clientId: CLIENT_ID + process.env.CLIENT_ID,
     brokers: BROKERS,
@@ -15,7 +43,8 @@ const km = new KafkaManager({
     connectionTimeout: TIMEOUT,
     requestTimeout: TIMEOUT,
     logLevel: 'NOTHING',
-    useSSL: false
+    useSSL: false,
+    logger
 });
 
 const runme = async () => {
@@ -24,80 +53,82 @@ const runme = async () => {
 
     const consumer = km.CreateConsumer(GROUP_ID + process.env.GROUP_ID);
 
+
+
     await consumer.Connect((error) => {
-        console.error(`Connect(): Error: [${error}]`);
+        LogErrorMessage(`Connect(): Error: [${error}]`);
     });
 
     await consumer.Subscribe([TOPIC], fromBeginning, (error) => {
-        console.error(`Subscribe(): Error: [${error}]`);
+        LogErrorMessage(`Subscribe(): Error: [${error}]`);
     });
 
     await consumer.StartConsumingMessages((topic: string, key: string, partition: number, value: string, headers: JSONObject | undefined) => {
-        console.log({
+        LogInfoMessage({
             key,
             partition,
             value,
             headers
         });
     }, (error) => {
-        console.error(`StartConsumingMessages(): Error: [${error}]`);
+        LogErrorMessage(`StartConsumingMessages(): Error: [${error}]`);
     });
 
     await consumer.Stop((error) => {
-        console.error(`Stop(): Error: [${error}]`);
+        LogErrorMessage(`Stop(): Error: [${error}]`);
     });
 
     await consumer.Subscribe(['zzz'], fromBeginning, (error) => {
-        console.error(`Subscribe(): Error: [${error}]`);
+        LogErrorMessage(`Subscribe(): Error: [${error}]`);
     });
 
     await consumer.StartConsumingMessages((topic: string, key: string, partition: number, value: string, headers: JSONObject | undefined) => {
-        console.log({
+        LogInfoMessage({
             key,
             partition,
             value,
             headers
         });
     }, (error) => {
-        console.error(`StartConsumingMessages(): Error: [${error}]`);
+        LogErrorMessage(`StartConsumingMessages(): Error: [${error}]`);
     });
 
     await consumer.Stop((error) => {
-        console.error(`Stop(): Error: [${error}]`);
+        LogErrorMessage(`Stop(): Error: [${error}]`);
     });
 
     await consumer.Subscribe(['yyy'], fromBeginning, (error) => {
-        console.error(`Subscribe(): Error: [${error}]`);
+        LogErrorMessage(`Subscribe(): Error: [${error}]`);
     });
 
     await consumer.StartConsumingMessages((topic: string, key: string, partition: number, value: string, headers: JSONObject | undefined) => {
         /*
-        console.log({
+        this.#LogInfoMessage({
             key,
             partition,
             value,
             headers
         });
         */
-        console.log(`key: [${key}]   value: [${value}]   partition: [${partition}]  headers: [${headers}]`);
+        LogInfoMessage(`key: [${key}]   value: [${value}]   partition: [${partition}]  headers: [${headers}]`);
     }, (error) => {
-        console.error(`StartConsumingMessages(): Error: [${error}]`);
+        LogErrorMessage(`StartConsumingMessages(): Error: [${error}]`);
     });
 
     //await km.Subscribe(['zzz'], cb);
 
     process.on("SIGINT", async () => {
-        console.log('=========SIGTERM START =======================')
+        LogInfoMessage('=========SIGTERM START =======================')
         await consumer.Disconnect((error) => {
-            console.error(`Disconnect(): Error: [${error}]`);
+            LogErrorMessage(`Disconnect(): Error: [${error}]`);
         });
-        console.log('=========SIGTERM END =======================')
+        LogInfoMessage('=========SIGTERM END =======================')
         process.exit();
     });
 
     let iteration = 0;
     for (;;) {
-        console.log('sleep: ' + iteration++);
+        LogInfoMessage('sleep: ' + iteration++);
         await Sleep(1000);
     }
 }
@@ -109,10 +140,10 @@ const signalTraps = ['SIGTERM', 'SIGINT', 'SIGUSR2']
 errorTypes.forEach(type => {
     process.on(type, async () => {
         try {
-            console.log(`process.on ${type}`)
-            console.log('=========consumer.disconnect() START =======================')
+            this.#LogInfoMessage(`process.on ${type}`)
+            this.#LogInfoMessage('=========consumer.disconnect() START =======================')
             await consumer.disconnect()
-            console.log('=========consumer.disconnect() END =======================')
+            this.#LogInfoMessage('=========consumer.disconnect() END =======================')
             process.exit(0)
         } catch (_) {
             process.exit(1)
@@ -123,9 +154,9 @@ errorTypes.forEach(type => {
 signalTraps.forEach(type => {
     process.once(type, async () => {
         try {
-            console.log('=========consumer.disconnect() START [2] =======================')
+            this.#LogInfoMessage('=========consumer.disconnect() START [2] =======================')
             await consumer.disconnect()
-            console.log('=========consumer.disconnect() END [2] =======================')
+            this.#LogInfoMessage('=========consumer.disconnect() END [2] =======================')
         } finally {
             process.kill(process.pid, type)
         }
@@ -133,4 +164,4 @@ signalTraps.forEach(type => {
 })
 */
 
-runme().catch(e => console.error(`[example/producer] ${e.message}`, e))
+runme().catch(e => LogErrorMessage(`[example/producer] ${e.message}`))

package/src/kafkatesting/produce.ts

@@ -56,6 +56,33 @@ import { KafkaManager } from './../kafka/kafkamanager'
 
 import chalk from 'chalk';
 
+import winston from 'winston'
+
+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()
+    ]});
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any    
+const LogErrorMessage = (message: any) => {
+    logger.error(message);
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const LogInfoMessage = (message: any) => {
+    logger.info(message);
+}
+
 async function Sleep(milliseconds = 1000) { 
     return new Promise(resolve => setTimeout(resolve, milliseconds))
 }
@@ -67,30 +94,31 @@ const km = new KafkaManager({
     connectionTimeout: TIMEOUT,
     requestTimeout: TIMEOUT,
     logLevel: 'NOTHING',
-    useSSL: false
+    useSSL: false,
+    logger
 });
 
 const runme = async () => {
-    await km.CreateTopic(TOPIC, PARTITIONS, (error) => console.log(`CreateTopic: Error: [${error}]`));
-    await km.CreateTopic('zzz', 1, (error) => console.log(`CreateTopic: Error: [${error}]`));
-    await km.CreateTopic('yyy', 1, (error) => console.log(`CreateTopic: Error: [${error}]`));
+    await km.CreateTopic(TOPIC, PARTITIONS, (error) => LogInfoMessage(`CreateTopic: Error: [${error}]`));
+    await km.CreateTopic('zzz', 1, (error) => LogInfoMessage(`CreateTopic: Error: [${error}]`));
+    await km.CreateTopic('yyy', 1, (error) => LogInfoMessage(`CreateTopic: Error: [${error}]`));
 
     const producer = km.CreateProducer();
 
-    await producer.Connect((error) => console.log(`Connect: Error: [${error}]`));
+    await producer.Connect((error) => LogInfoMessage(`Connect: Error: [${error}]`));
 
     const count = 100000;
     const sleepTime = 1000;
 
     process.on("SIGINT", async () => {
-        console.log('=========SIGTERM START =======================')
-        await producer.Disconnect((error) => console.log(`Disconnect: Error: [${error}]`));
-        console.log('=========SIGTERM END =======================')
+        LogInfoMessage('=========SIGTERM START =======================')
+        await producer.Disconnect((error) => LogInfoMessage(`Disconnect: Error: [${error}]`));
+        LogInfoMessage('=========SIGTERM END =======================')
         process.exit();
     });
 
     for (let i=0; i < count; i++) {
-        if (i % 100 === 0) console.log(i);
+        if (i % 100 === 0) LogInfoMessage(i);
         const retVal = await producer.SendMessages(TOPIC, [
             { key: 'key1', value: chalk.green(`hello world - ${i}`) },
             { key: 'key2', value: 'hey hey! -2' },
@@ -98,34 +126,34 @@ const runme = async () => {
             { key: 'key4', value: 'hey hey! -4' },
             { key: 'key5', value: 'hey hey! -5' }
         ], (error) => {
-            console.error(error);
+            LogErrorMessage(error);
         }
         );
 
         await producer.SendMessages('zzz', [
             { key: 'key-zzz', value: chalk.yellow(`hello world - ${i}`) }
         ], (error) => {
-            console.error(error);
+            LogErrorMessage(error);
         }
         );
 
         await producer.SendMessages('yyy', [
             { key: 'key-yyy', value: chalk.cyan(`hello world - ${i}`) }
         ], (error) => {
-            console.error(error);
+            LogErrorMessage(error);
         }
         );
 
         if (i % 100 === 0) {
-            console.log(retVal);
-            console.log(` ------------=================> ${i}`);
+            LogInfoMessage(retVal);
+            LogInfoMessage(` ------------=================> ${i}`);
         }
         if (sleepTime >= 0) {
             await Sleep(sleepTime);
         }
     }
 
-    await producer.Disconnect((error) => console.log(`Disconnect: Error: [${error}]`));
+    await producer.Disconnect((error) => LogInfoMessage(`Disconnect: Error: [${error}]`));
 }
 
 /*
@@ -135,7 +163,7 @@ const signalTraps = ['SIGTERM', 'SIGINT', 'SIGUSR2']
 errorTypes.forEach(type => {
     process.on(type, async () => {
         try {
-            console.log(`process.on ${type}`)
+            LogInfoMessage(`process.on ${type}`)
             await producer.disconnect()
             process.exit(0)
         } catch (_) {
@@ -155,5 +183,5 @@ signalTraps.forEach(type => {
 })
 */
 
-runme().catch(e => console.error(`[example/producer] ${e.message}`, e))
+runme().catch(e => LogErrorMessage(`[example/producer] ${e.message}`))
 

package/src/masterprocessbase.ts

@@ -60,6 +60,14 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
         });
     }
 
+    #LogErrorMessage(message: any) {
+        this.options.logger.error(message);
+    }
+
+    #LogInfoMessage(message: any) {
+        this.options.logger.info(message);
+    }
+
     override CollectAdditionalTelemetry(): void {
         si.get(this.#siValueObject).then(data => {
             this.UpdateInstrument(Gauge.CPU_SYSTEM_LOAD_GAUGE, {
@@ -156,7 +164,7 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
             });
         } catch (error)
         {
-            console.error(error);
+            this.#LogErrorMessage(error);
             throw error;
         }
     }
@@ -362,7 +370,12 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
     // eslint-disable-next-line  @typescript-eslint/no-explicit-any
     #SpawnWorker = (spawnWorkerOptions?: any): number => {
         const workerEnv: any = { };
-        workerEnv['STS_GSD_SII'] = JSON.stringify(this.options);
+
+        const tempOptions = { ...this.options };
+        delete (tempOptions as any).logger;
+        delete (tempOptions as any).publisherLogger;
+
+        workerEnv['STS_GSD_SII'] = JSON.stringify(tempOptions);
         if (spawnWorkerOptions) {
             workerEnv['STS_GSD_OPTIONS'] = JSON.stringify(spawnWorkerOptions);
         }

package/src/processbase.ts

@@ -8,9 +8,6 @@ import { GetFirstNetworkInterface } from './network'
 
 import chalk from 'chalk';
 
-import debugModule from 'debug'
-const debug = debugModule(`proc:${process.pid}:processBase`);
-
 import { Gauge, InstrumentBaseTelemetry, InstrumentGaugeTelemetry, InstrumentObjectTelemetry, InstrumentLogTelemetry } from '@nsshunt/stsinstrumentation'
 
 import { PGAccessLayer, PGPoolManager, PGPoolManagerEventName } from '@nsshunt/stsdatamanagement'
@@ -32,7 +29,7 @@ import { Worker } from 'worker_threads';
 
 import os from 'os';
 
-import { IProcessBase, ISocketIoServerHelper, logFunction } from './commonTypes'
+import { IProcessBase, ISocketIoServerHelper } from './commonTypes'
 
 import { STSDefaultClientToServerEvents, STSDefaultServerToClientEvents } from '@nsshunt/stssocketio-client'
 
@@ -47,7 +44,6 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
     #socketIoServerHelper: ISocketIoServerHelper<STSDefaultClientToServerEvents, STSDefaultServerToClientEvents> | null = null;
     #accessLayer: PGAccessLayer | null = null;
     #poolManager: PGPoolManager | null = null;
-    #logEx: logFunction | null = null;
 
     constructor(options: ProcessOptions)
     {
@@ -59,6 +55,39 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
         }
     }
 
+    #GetFormattedLogMessage(message: string): string {
+        let prefix = '';
+        let col = null;
+        const appName = this.options.serviceName;
+
+        if (cluster.isPrimary) {
+            prefix = 'M';
+            col = chalk.bold.cyan;
+        } else {
+            prefix = 'W';
+            col = chalk.green;
+        }
+        return col(`${prefix}(${process.pid}) [${appName}]: ${message}`);
+    }
+
+    LogErrorMessage(message: any) {
+        const msg = this.#GetFormattedLogMessage(message);
+        this.options.logger.error(msg);
+
+        this.UpdateInstrument(Gauge.LOGGER, {
+            LogMessage: msg
+        } as InstrumentLogTelemetry);
+    }
+
+    LogInfoMessage(message: any) {
+        const msg = this.#GetFormattedLogMessage(message);
+        this.options.logger.info(msg);
+
+        this.UpdateInstrument(Gauge.LOGGER, {
+            LogMessage: msg
+        } as InstrumentLogTelemetry);
+    }
+
     override get options(): ProcessOptions {
         return super.options as ProcessOptions;
     }
@@ -67,29 +96,6 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
         return false;
     }
     
-    #log(appName: any): logFunction {
-        return (msg) =>
-        {
-            let prefix = '';
-            let col = null;
-    
-            if (cluster.isPrimary)
-            {
-                prefix = 'M';
-                col = chalk.bold.cyan;
-            } else {
-                prefix = 'W';
-                col = chalk.green;
-            }
-            const msgEx = col(`${prefix}(${process.pid}) [${appName}]: ${msg}`);
-            debug(msgEx);
-        
-            this.UpdateInstrument(Gauge.LOGGER, {
-                LogMessage: msgEx
-            } as InstrumentLogTelemetry);
-        };
-    }
-
     #GetRootFolder = (): string => {
         const mainpath = require.resolve('@nsshunt/stsutils');
         const anotherDir = path.dirname(mainpath);
@@ -130,7 +136,8 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
                 maxFreeSockets: goptions.maxFreeSockets,
                 timeout: goptions.timeout,
                 rejectUnauthorized: goptions.isProduction // Allows self signed certs in non production mode(s)
-            }
+            },
+            logger: this.options.logger
         } as IPublishTransportRESTServerOptions
     }
 
@@ -168,7 +175,6 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
             const publishTransportOptions: IPublishTransportRESTServerOptions = {
                 transportType: TransportType.RESTAPI,
                 url: `${goptions.imendpoint}:${goptions.import}${goptions.imapiroot}/publishmessage`,
-                publishdebug: goptions.publishdebug,
                 // socketPath: '/var/run/sts/stsrest01.sock'
                 agentOptions: {
                     keepAlive: goptions.keepAlive,
@@ -177,11 +183,14 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
                     maxFreeSockets: goptions.maxFreeSockets,
                     timeout: goptions.timeout,
                     rejectUnauthorized: goptions.isProduction // Allows self signed certs in non production mode(s)
-                }
+                },
+                logger: this.options.publisherLogger
             };
             publisherTransport = new PublishTransportRESTServerV2(publishTransportOptions);
         } else {
-            publisherTransport = new PublishTransportDirect();   
+            publisherTransport = new PublishTransportDirect({
+                logger: this.options.publisherLogger
+            });
         }
 
         const instrumentControllerOptions: IPublishInstrumentControllerOptionsV2 = {
@@ -193,7 +202,8 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
             instrumentationObservationInterval: this.options.instrumentationObservationInterval,
             instrumentationTimeWindow: this.options.instrumentationTimeWindow,
             instrumentDefinitions: this.GetAdditionalInstruments(),
-            publisherTransport
+            publisherTransport,
+            logger: this.options.publisherLogger
         }
 
         this.#instrumentController = new PublishInstrumentControllerV2(instrumentControllerOptions);
@@ -239,8 +249,6 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
             this.CollectAdditionalTelemetry();
 
         }, goptions.systemInformationInterval).unref();
-		
-        this.#logEx = this.#log(this.options.serviceName);
 
         if (this.options.useDatabase) {
             // Get the accessLayer to force DB connection test
@@ -259,14 +267,7 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
     }
 
     LogEx = (message: any) => {
-        if (this.#logEx) {
-            this.#logEx(message);
-        } else {
-            console.log('')
-            console.log('************* Attempt to log before _logex set ***************')
-            console.log(message)
-            console.log('')
-        }
+        this.LogInfoMessage(message);
     }
 
     InstrumentExists(instrumentName: Gauge): boolean
@@ -328,8 +329,14 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
     {
         if (this.options.useDatabase) {
             if (this.#accessLayer === null) {
-                this.#poolManager = new PGPoolManager();
-                this.#accessLayer = new PGAccessLayer(this.#poolManager);
+                this.#poolManager = new PGPoolManager({
+                    usedefaultdb: false,
+                    logger: this.options.logger
+                });
+                this.#accessLayer = new PGAccessLayer({
+                    poolManager: this.#poolManager,
+                    logger: this.options.logger
+                });
                 (async () => {
                     try {
                         const retVal = await (this.accessLayer as PGAccessLayer).getResourceCount();

package/src/processoptions.ts

@@ -3,6 +3,7 @@ import { IServiceProcessContext } from '@nsshunt/stspublisherserver'
 import express from 'express'
 
 import { IProcessBase } from './commonTypes'
+import { ISTSLogger } from '@nsshunt/stsutils'
 
 export interface STSExpressServer {
 	get App(): express.Express
@@ -161,4 +162,9 @@ export interface ProcessOptions {
      * Is this application using nodejs cluster mode?
      */
     clusterMode: boolean
+
+    logger: ISTSLogger
+
+    publisherLogger: ISTSLogger
+
 }

package/src/publishertransports/publishTransportDirect.ts

@@ -10,21 +10,34 @@ import { InfluxDBManager } from './../influxdb/influxDBManager'
 import { PublishTransportUtils } from './publishTransportUtils'
 
 import chalk from 'chalk';
+import { ISTSLogger } from '@nsshunt/stsutils';
+
+export interface IPublishTransportDirectOptions {
+    logger: ISTSLogger
+}
 
 export class PublishTransportDirect implements IPublisherTransport
 {
     #influxDBManager: InfluxDBManager;
     #IMkafkaManager: IMKafkaManager;
+    #options: IPublishTransportDirectOptions;
 
-    constructor()
+    constructor(options: IPublishTransportDirectOptions)
     {
-        this.#influxDBManager = new InfluxDBManager();
-        this.#IMkafkaManager = new IMKafkaManager();
+        this.#options = options;
+        this.#influxDBManager = new InfluxDBManager(this.#options.logger);
+        this.#IMkafkaManager = new IMKafkaManager({
+            logger: this.#options.logger
+        });
         this.#IMkafkaManager.Start((error) => {
-            console.error(chalk.red(`${process.pid}:PublishTransportDirect:constructor(): Error during IMkafkaManager.Start: [${error}]`));
+            this.#LogErrorMessage(chalk.red(`${process.pid}:PublishTransportDirect:constructor(): Error during IMkafkaManager.Start: [${error}]`));
         });
     }
 
+    #LogErrorMessage(message: any) {
+        this.#options.logger.error(message);
+    }
+
     // Returns true for success or false for failure.
     Publish = async (payload: IInstrumentPayload): Promise<boolean> =>
     {
@@ -35,7 +48,7 @@ export class PublishTransportDirect implements IPublisherTransport
             //this.#SendIPCMessageToMaster(InstrumentManagerEventName.UPDATE_INSTRUMENT_DATA, instrumentPayload)
             this.#influxDBManager.OutputInfluxDB(payload);
             this.#IMkafkaManager.OutputLogs(payload, (error) => {
-                console.error(chalk.red(`${process.pid}:PublishTransportDirect:Publish(): Error during IMkafkaManager.OutputLogs: [${error}]`));
+                this.#LogErrorMessage(chalk.red(`${process.pid}:PublishTransportDirect:Publish(): Error during IMkafkaManager.OutputLogs: [${error}]`));
             });
 
             return true;

package/src/server.ts

@@ -33,7 +33,7 @@ export class STSExpressServer
         });
 
         serverNetworkMiddleware.on(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, (data: ISocketRecord) => {
-            //console.log(chalk.magenta(`serverNetworkMiddleware: [${JSON.stringify(data)}]`));
+            //this.#LogInfoMessage(chalk.magenta(`serverNetworkMiddleware: [${JSON.stringify(data)}]`));
             stsApp.UpdateInstrument(Gauge.NETWORK_RX_GAUGE, {
                 Inc: data.requestBytesRead
             } as InstrumentGaugeTelemetry);
@@ -119,7 +119,7 @@ export class STSExpressServer
             //@@ add to errors metric here - perhaps break down by type
 
             if (err) {
-                //@@console.log(err);
+                //@@this.#LogInfoMessage(err);
                 res.status(err.status).send(err);
             } else {
                 next();

package/src/serverprocessbase.ts

@@ -114,7 +114,7 @@ export class ServerProcessBase extends ProcessBase
 
     #SetupTLSServer = async (socket: net.Socket): Promise<void> => {
         // Add a 'close' event handler to this instance of socket
-        console.log('CONNECTED: ' + socket.remoteAddress + ':' + socket.remotePort + ' ' + process.pid);
+        this.LogInfoMessage('CONNECTED: ' + socket.remoteAddress + ':' + socket.remotePort + ' ' + process.pid);
         this.#sockets.push(socket);
 
         //const self = this;
@@ -123,11 +123,11 @@ export class ServerProcessBase extends ProcessBase
                 return o.remoteAddress === socket.remoteAddress && o.remotePort === socket.remotePort;
             })
             if (index !== -1) this.#sockets.splice(index, 1);
-            console.log('CLOSED: ' + socket.remoteAddress + ' ' + socket.remotePort + ' ' + process.pid);
+            this.LogInfoMessage('CLOSED: ' + socket.remoteAddress + ' ' + socket.remotePort + ' ' + process.pid);
         });
 
-        socket.on('data', function(data: any) {
-            console.log('DATA ' + socket.remoteAddress + ': ' + socket.remotePort + ': ' + data);
+        socket.on('data', (data: any) => {
+            this.LogInfoMessage('DATA ' + socket.remoteAddress + ': ' + socket.remotePort + ': ' + data);
             socket.write(socket.remoteAddress + ':' + socket.remotePort + " said " + data + '\n');
 
             // Write the data back to all the connected, the client will receive it as data from the server
@@ -141,14 +141,14 @@ export class ServerProcessBase extends ProcessBase
     }
 
     #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);
         });
     }
 
@@ -234,7 +234,7 @@ export class ServerProcessBase extends ProcessBase
         // The second parameter is the automatic listener for the secureConnection event from the tls.Server class
         this.#httpServer = tls.createServer(this.#GetTLSOptions(), this.#SetupTLSServer);
         this.#httpServer.listen(this.options.listenPort, 'stscore.stsmda.org', () => { 
-            console.log('TCP Server is running on port ' + this.options.listenPort + '.');
+            this.LogInfoMessage('TCP Server is running on port ' + this.options.listenPort + '.');
         }).on('listening', () =>
         {
             this.LogEx(`TCP live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
@@ -250,7 +250,7 @@ export class ServerProcessBase extends ProcessBase
         this.#httpServer = jaysonServer.tls(this.#GetTLSOptions());
         (this.#httpServer as tls.Server).on('secureConnection', this.#SetupRPCServer);
         this.#httpServer.listen(this.options.listenPort, '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}`);