@nsshunt/stsappframework 3.0.106 → 3.0.108
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/influxdb/influxDBManager.js +17 -16
- package/dist/influxdb/influxDBManager.js.map +1 -1
- package/dist/influxdb/influxDBManagerAgent.js +13 -9
- package/dist/influxdb/influxDBManagerAgent.js.map +1 -1
- package/dist/influxdb/influxDBManagerBase.js +6 -2
- package/dist/influxdb/influxDBManagerBase.js.map +1 -1
- package/dist/influxdb/influxDBManagerService.js +14 -10
- package/dist/influxdb/influxDBManagerService.js.map +1 -1
- package/dist/instrumentationsubscriber.js +16 -12
- package/dist/instrumentationsubscriber.js.map +1 -1
- package/dist/processbase.js +10 -8
- package/dist/processbase.js.map +1 -1
- package/dist/server.js +1 -1
- package/dist/server.js.map +1 -1
- package/dist/tcpclient/app2.js +2 -2
- package/dist/tcpserver/appmaster.js +16 -39
- package/dist/tcpserver/appmaster.js.map +1 -1
- package/package.json +1 -1
- package/src/influxdb/influxDBManager.ts +18 -16
- package/src/influxdb/influxDBManagerAgent.ts +11 -9
- package/src/influxdb/influxDBManagerBase.ts +4 -2
- package/src/influxdb/influxDBManagerService.ts +12 -10
- package/src/instrumentationsubscriber.ts +15 -12
- package/src/processbase.ts +11 -7
- package/src/server.ts +1 -1
- package/src/tcpclient/app2.ts +2 -2
- package/src/tcpserver/appmaster.ts +17 -39
- package/types/influxdb/influxDBManager.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerAgent.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerBase.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerService.d.ts.map +1 -1
- package/types/instrumentationsubscriber.d.ts.map +1 -1
- package/types/processbase.d.ts +2 -2
- package/types/processbase.d.ts.map +1 -1
- package/types/tcpserver/appmaster.d.ts.map +1 -1
package/dist/processbase.js
CHANGED
|
@@ -9,9 +9,9 @@ const pidusage_1 = __importDefault(require("pidusage"));
|
|
|
9
9
|
const process_1 = require("process");
|
|
10
10
|
const node_path_1 = __importDefault(require("node:path"));
|
|
11
11
|
const node_cluster_1 = __importDefault(require("node:cluster"));
|
|
12
|
-
const colors_1 = __importDefault(require("colors"));
|
|
13
12
|
const systeminformation_1 = __importDefault(require("systeminformation")); // https://systeminformation.io/
|
|
14
13
|
const network_1 = require("./network");
|
|
14
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
15
15
|
const debug_1 = __importDefault(require("debug"));
|
|
16
16
|
const debug = (0, debug_1.default)(`proc:${process.pid}:processBase`);
|
|
17
17
|
const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
|
|
@@ -52,11 +52,13 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
|
|
|
52
52
|
let col = null;
|
|
53
53
|
if (node_cluster_1.default.isPrimary) {
|
|
54
54
|
prefix = 'M';
|
|
55
|
-
col =
|
|
55
|
+
//col = colors.bold.cyan; // chalk.bold.cyan;
|
|
56
|
+
col = chalk_1.default.bold.cyan;
|
|
56
57
|
}
|
|
57
58
|
else {
|
|
58
59
|
prefix = 'W';
|
|
59
|
-
col =
|
|
60
|
+
//col = colors.green; // chalk.green;
|
|
61
|
+
col = chalk_1.default.green;
|
|
60
62
|
}
|
|
61
63
|
const msgEx = col(`${prefix}(${process.pid}) [${appName}]: ${msg}`);
|
|
62
64
|
debug(msgEx);
|
|
@@ -267,15 +269,15 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
|
|
|
267
269
|
try {
|
|
268
270
|
const retVal = await this.accessLayer.getResourceCount();
|
|
269
271
|
if (retVal.status !== http_status_codes_1.StatusCodes.OK) {
|
|
270
|
-
this.LogEx(`Unable to get resources from the database. Is the database running? [${JSON.stringify(retVal)}]
|
|
272
|
+
this.LogEx(chalk_1.default.red(`Unable to get resources from the database. Is the database running? [${JSON.stringify(retVal)}]`));
|
|
271
273
|
(0, process_1.exit)(1);
|
|
272
274
|
}
|
|
273
275
|
else {
|
|
274
|
-
this.LogEx(`Database connection successful. Resources: [${retVal.detail.count}]
|
|
276
|
+
this.LogEx(chalk_1.default.green(`Database connection successful. Resources: [${retVal.detail.count}]`));
|
|
275
277
|
}
|
|
276
278
|
}
|
|
277
279
|
catch (error) {
|
|
278
|
-
this.LogEx(`Unable to get resources from the database. Is the database running? Error: [${error}]
|
|
280
|
+
this.LogEx(chalk_1.default.red(`Unable to get resources from the database. Is the database running? Error: [${error}]`));
|
|
279
281
|
(0, process_1.exit)(1);
|
|
280
282
|
}
|
|
281
283
|
})();
|
|
@@ -333,10 +335,10 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
|
|
|
333
335
|
GetSignalColour = (signal) => {
|
|
334
336
|
let msgcolor = null;
|
|
335
337
|
if (signal === 'SIGINT') {
|
|
336
|
-
msgcolor =
|
|
338
|
+
msgcolor = chalk_1.default.yellow;
|
|
337
339
|
}
|
|
338
340
|
else {
|
|
339
|
-
msgcolor =
|
|
341
|
+
msgcolor = chalk_1.default.red;
|
|
340
342
|
}
|
|
341
343
|
return msgcolor;
|
|
342
344
|
};
|
package/dist/processbase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":";;;;;;AAAA,wFAAwF,CAAE,UAAU;AACpG,wDAA+B;AAC/B,qCAA2C;AAC3C,0DAA6B;AAC7B,gEAAkC;
|
|
1
|
+
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":"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"}
|
package/dist/server.js
CHANGED
|
@@ -25,7 +25,7 @@ class STSExpressServer {
|
|
|
25
25
|
outputDebug: false
|
|
26
26
|
});
|
|
27
27
|
serverNetworkMiddleware.on(serverNetworkMiddleware_1.ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, (data) => {
|
|
28
|
-
//console.log(`serverNetworkMiddleware: [${JSON.stringify(data)}]
|
|
28
|
+
//console.log(chalk.magenta(`serverNetworkMiddleware: [${JSON.stringify(data)}]`));
|
|
29
29
|
stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.NETWORK_RX_GAUGE, {
|
|
30
30
|
Inc: data.requestBytesRead
|
|
31
31
|
});
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;AAAA,wFAAwF,CAAE,UAAU;AACpG,sDAA4E;AAE5E,gDAAwB;AACxB,kEAAyC;AAEzC,oEAAuG;AAIvG,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAG3B,oEAAwI;AAExI,kFAA+H;AAE/H,MAAa,gBAAgB;IAEzB,IAAI,CAAU;IAEd,YAAY,OAAuB,EAAE,MAAoB;QAErD,wDAAwD;QACxD,MAAM,uBAAuB,GAAG,IAAI,4CAAuB,CAAC;YACxD,cAAc,EAAE,QAAQ,CAAC,cAAc;SAC1C,CAAC,CAAC;QAEH,MAAM,uBAAuB,GAAG,IAAI,iDAAuB,CAAC;YACxD,IAAI,EAAG,MAAM,CAAC,OAA0B,CAAC,WAAW;YACpD,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC;QAEH,uBAAuB,CAAC,EAAE,CAAC,0DAAgC,CAAC,+BAA+B,EAAE,CAAC,IAAmB,EAAE,EAAE;YACjH,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/dist/tcpclient/app2.js
CHANGED
|
@@ -47,10 +47,10 @@ socket2.on('secureConnect', () => {
|
|
|
47
47
|
dosomework(socket2);
|
|
48
48
|
});
|
|
49
49
|
socket2.on('close', function(data: any) {
|
|
50
|
-
console.log(`CLOSED: ${socket2.remoteAddress} ${socket2.remotePort}
|
|
50
|
+
console.log(chalk.green(`CLOSED: ${socket2.remoteAddress} ${socket2.remotePort}`));
|
|
51
51
|
});
|
|
52
52
|
socket2.on('data', function(data: any) {
|
|
53
|
-
console.log(`DATA ${socket2.remoteAddress} ${socket2.remotePort} ${data}
|
|
53
|
+
console.log(chalk.green(`DATA ${socket2.remoteAddress} ${socket2.remotePort} ${data}`));
|
|
54
54
|
});
|
|
55
55
|
*/
|
|
56
56
|
//# sourceMappingURL=app2.js.map
|
|
@@ -9,6 +9,7 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
9
9
|
const crypto_1 = __importDefault(require("crypto"));
|
|
10
10
|
const jayson_1 = __importDefault(require("jayson"));
|
|
11
11
|
const masterprocessbase_1 = require("./../masterprocessbase");
|
|
12
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
12
13
|
// Colour codes
|
|
13
14
|
// ---------------------------------
|
|
14
15
|
// Red - Error
|
|
@@ -97,14 +98,14 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
97
98
|
// Update my currentTerm
|
|
98
99
|
this.#currentTerm = term;
|
|
99
100
|
// Return my yes vote
|
|
100
|
-
console.log(`${message} - Vote Yes
|
|
101
|
+
console.log(chalk_1.default.green(`${message} - Vote Yes`));
|
|
101
102
|
callback(null, true); // YES vote
|
|
102
103
|
};
|
|
103
104
|
#VoteNo = (callback, term, message) => {
|
|
104
105
|
// Log the fact that I have now voted for this currentTerm
|
|
105
106
|
this.#votedLog[term] = true;
|
|
106
107
|
// Return my yes vote
|
|
107
|
-
console.log(`${message} - Vote No
|
|
108
|
+
console.log(chalk_1.default.yellow(`${message} - Vote No`));
|
|
108
109
|
callback(null, false); // NO vote
|
|
109
110
|
};
|
|
110
111
|
#FindService = (host, port) => {
|
|
@@ -192,21 +193,21 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
192
193
|
const retVal = this.#CheckMoreRecentTerm(term, lastLogItemTerm, lastLogItemIndex);
|
|
193
194
|
if (retVal.retVal === true) {
|
|
194
195
|
console.log(`${retVal.msg}`);
|
|
195
|
-
console.log(`${this.#GetLogPrefix()}: New leader detected, Host: [${host}], Port: [${port}], while in CANDIDATE mode, reverting to FOLLOWER
|
|
196
|
+
console.log(chalk_1.default.magenta(`${this.#GetLogPrefix()}: New leader detected, Host: [${host}], Port: [${port}], while in CANDIDATE mode, reverting to FOLLOWER.`));
|
|
196
197
|
// This sending node is the leader so revert to follower
|
|
197
198
|
this.#currentTerm = term;
|
|
198
199
|
this.#ChangeState(AppMasterRAFTState.FOLLOWER);
|
|
199
200
|
}
|
|
200
201
|
else {
|
|
201
202
|
console.log(`${retVal.msg}`);
|
|
202
|
-
console.log(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}]
|
|
203
|
+
console.log(chalk_1.default.magenta(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}].`));
|
|
203
204
|
// Reject this RPC and continue in the CANDIDATE state
|
|
204
205
|
callback(null, false);
|
|
205
206
|
return;
|
|
206
207
|
}
|
|
207
208
|
}
|
|
208
209
|
else if (this.#RAFTState.localeCompare(AppMasterRAFTState.LEADER) === 0) {
|
|
209
|
-
console.log(`${this.#GetLogPrefix()}: appendEntry called while I am the current leader, rejecting RPC call
|
|
210
|
+
console.log(chalk_1.default.red(`${this.#GetLogPrefix()}: appendEntry called while I am the current leader, rejecting RPC call.`));
|
|
210
211
|
// Reject this RPC and continue in the LEADER state
|
|
211
212
|
callback(null, false);
|
|
212
213
|
return;
|
|
@@ -225,7 +226,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
225
226
|
}
|
|
226
227
|
else {
|
|
227
228
|
console.log(`${retVal.msg}`);
|
|
228
|
-
console.log(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}]
|
|
229
|
+
console.log(chalk_1.default.magenta(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}].`));
|
|
229
230
|
// Reject this RPC and continue in the CANDIDATE state
|
|
230
231
|
callback(null, false);
|
|
231
232
|
return;
|
|
@@ -236,14 +237,14 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
236
237
|
if (sentLeaderService) {
|
|
237
238
|
if (sentLeaderService.host.localeCompare(this.#leaderNode.host) !== 0 || sentLeaderService.port !== this.#leaderNode.port) {
|
|
238
239
|
this.#leaderNode = sentLeaderService;
|
|
239
|
-
console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]
|
|
240
|
+
console.log(chalk_1.default.white(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`));
|
|
240
241
|
}
|
|
241
242
|
}
|
|
242
243
|
}
|
|
243
244
|
else {
|
|
244
245
|
this.#leaderNode = this.#FindService(host, port);
|
|
245
246
|
if (this.#leaderNode) {
|
|
246
|
-
console.log(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]
|
|
247
|
+
console.log(chalk_1.default.white(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`));
|
|
247
248
|
}
|
|
248
249
|
}
|
|
249
250
|
// Now update the log if only more recent
|
|
@@ -270,18 +271,6 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
270
271
|
host: service.host
|
|
271
272
|
};
|
|
272
273
|
const client = jayson_1.default.client.tls(options);
|
|
273
|
-
/*
|
|
274
|
-
client.on('tcp socket', (socket: tls.TLSSocket) => {
|
|
275
|
-
socket.setTimeout(200); //@@ config
|
|
276
|
-
socket.on('timeout', () => {
|
|
277
|
-
console.log('socket timeout');
|
|
278
|
-
socket.end();
|
|
279
|
-
});
|
|
280
|
-
});
|
|
281
|
-
client.on('tcp error', (error: any) => {
|
|
282
|
-
console.log(`ERROR: [${error}]`.red);
|
|
283
|
-
});
|
|
284
|
-
*/
|
|
285
274
|
let lastLogItem;
|
|
286
275
|
if (this.#log.length > 0) {
|
|
287
276
|
lastLogItem = this.#log[this.#log.length - 1];
|
|
@@ -295,7 +284,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
295
284
|
}
|
|
296
285
|
client.request('vote', [this.#currentTerm, lastLogItem.term, lastLogItem.index], (error, response) => {
|
|
297
286
|
if (error) {
|
|
298
|
-
//console.log(`vote attempt fail: [${JSON.stringify(options)}: ${error}]
|
|
287
|
+
//console.log(chalk.red(`vote attempt fail: [${JSON.stringify(options)}: ${error}]`));
|
|
299
288
|
}
|
|
300
289
|
else {
|
|
301
290
|
// Log the result
|
|
@@ -312,18 +301,6 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
312
301
|
host: service.host
|
|
313
302
|
};
|
|
314
303
|
const client = jayson_1.default.client.tls(options);
|
|
315
|
-
/*
|
|
316
|
-
client.on('tcp socket', (socket: tls.TLSSocket) => {
|
|
317
|
-
socket.setTimeout(200); //@@ config
|
|
318
|
-
socket.on('timeout', () => {
|
|
319
|
-
console.log('socket timeout');
|
|
320
|
-
socket.end();
|
|
321
|
-
});
|
|
322
|
-
});
|
|
323
|
-
client.on('tcp error', (error: any) => {
|
|
324
|
-
console.log(`ERROR: [${error}]`.red);
|
|
325
|
-
});
|
|
326
|
-
*/
|
|
327
304
|
let lastLogItem;
|
|
328
305
|
if (this.#log.length > 0) {
|
|
329
306
|
lastLogItem = this.#log[this.#log.length - 1];
|
|
@@ -337,7 +314,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
337
314
|
}
|
|
338
315
|
client.request('appendEntry', [this.#thisService.host, this.#thisService.port, this.#currentTerm, lastLogItem.term, lastLogItem.index], (error, response) => {
|
|
339
316
|
if (error) {
|
|
340
|
-
//console.log(`appendEntry attempt fail: [${JSON.stringify(options)}: ${error}]
|
|
317
|
+
//console.log(chalk.red(`appendEntry attempt fail: [${JSON.stringify(options)}: ${error}]`));
|
|
341
318
|
}
|
|
342
319
|
else {
|
|
343
320
|
this.#appendedEntries[this.#GetServiceKey(service)] = 1;
|
|
@@ -386,13 +363,13 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
386
363
|
this.#StartAppendEntries();
|
|
387
364
|
}
|
|
388
365
|
else {
|
|
389
|
-
console.log(`${this.#GetLogPrefix()}: Not enough response for valid cluster state
|
|
366
|
+
console.log(chalk_1.default.red(`${this.#GetLogPrefix()}: Not enough response for valid cluster state.`));
|
|
390
367
|
}
|
|
391
368
|
}, this.#heartBeatTimeout);
|
|
392
369
|
};
|
|
393
370
|
#Promote = () => {
|
|
394
371
|
this.#ChangeState(AppMasterRAFTState.LEADER);
|
|
395
|
-
console.log(`${this.#GetLogPrefix()}: New LEADER is elected: [${this.#GetSelfServiceKey()}]
|
|
372
|
+
console.log(chalk_1.default.green(`${this.#GetLogPrefix()}: New LEADER is elected: [${this.#GetSelfServiceKey()}]`));
|
|
396
373
|
// As leader, now start the regular pings
|
|
397
374
|
this.#StartAppendEntries();
|
|
398
375
|
};
|
|
@@ -436,7 +413,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
436
413
|
// Log the result - Vote for myself
|
|
437
414
|
this.#votes[this.#GetSelfServiceKey()] = 1;
|
|
438
415
|
// Return my yes vote
|
|
439
|
-
console.log(`${this.#GetLogPrefix()}: SELF VOTE: canidate currentTerm: [${this.#currentTerm}], vote YES
|
|
416
|
+
console.log(chalk_1.default.green(`${this.#GetLogPrefix()}: SELF VOTE: canidate currentTerm: [${this.#currentTerm}], vote YES`));
|
|
440
417
|
this.#CheckMajority();
|
|
441
418
|
}
|
|
442
419
|
else {
|
|
@@ -466,12 +443,12 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
466
443
|
}, this.#electionTimeout).unref();
|
|
467
444
|
};
|
|
468
445
|
#StartRAFTService = async () => {
|
|
469
|
-
this.LogEx(`---[ RAFT Protocol Starting ]
|
|
446
|
+
this.LogEx(chalk_1.default.green(`---[ RAFT Protocol Starting ]---`));
|
|
470
447
|
this.#server = await this.#SetupJSONRPCServer();
|
|
471
448
|
this.#StartElectionTimeout();
|
|
472
449
|
};
|
|
473
450
|
#ChangeState(newState) {
|
|
474
|
-
this.LogEx(`${this.#GetLogPrefix()}: State Change, From: [${this.#RAFTState.toString()}] --> To: [${newState.toString()}]
|
|
451
|
+
this.LogEx(chalk_1.default.magenta(`${this.#GetLogPrefix()}: State Change, From: [${this.#RAFTState.toString()}] --> To: [${newState.toString()}]`));
|
|
475
452
|
this.#RAFTState = newState;
|
|
476
453
|
}
|
|
477
454
|
MasterStarted() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appmaster.js","sourceRoot":"","sources":["../../src/tcpserver/appmaster.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"appmaster.js","sourceRoot":"","sources":["../../src/tcpserver/appmaster.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,6 +4,8 @@ import { InfluxDB, WriteApi, QueryApi, DEFAULT_WriteOptions, WriteOptions } from
|
|
|
4
4
|
//import { Agent } from 'https'
|
|
5
5
|
import { Agent } from 'http'
|
|
6
6
|
|
|
7
|
+
import chalk from 'chalk';
|
|
8
|
+
|
|
7
9
|
import { $Options } from '@nsshunt/stsconfig'
|
|
8
10
|
import { JSONObject } from '@nsshunt/stsutils'
|
|
9
11
|
const goptions = $Options()
|
|
@@ -274,15 +276,15 @@ export class InfluxDBManager
|
|
|
274
276
|
org: 'my-org'
|
|
275
277
|
});
|
|
276
278
|
if (tasks.tasks) {
|
|
277
|
-
console.log(`[InfluxDB Tasks] - Count: [${tasks.tasks.length}]
|
|
279
|
+
console.log(chalk.cyan(`[InfluxDB Tasks] - Count: [${tasks.tasks.length}]`));
|
|
278
280
|
tasks.tasks.forEach((task: Task) => {
|
|
279
|
-
console.log(`-- [ Start Task Definition ]
|
|
280
|
-
console.log(`${JSON.stringify(task)}
|
|
281
|
-
console.log(`authorizationID: [${task.authorizationID}]
|
|
282
|
-
console.log(`-- [ End Task Definition ]
|
|
281
|
+
console.log(chalk.cyan(`-- [ Start Task Definition ]--`));
|
|
282
|
+
console.log(chalk.green(`${JSON.stringify(task)}`));
|
|
283
|
+
console.log(chalk.yellow(`authorizationID: [${task.authorizationID}]`));
|
|
284
|
+
console.log(chalk.cyan(`-- [ End Task Definition ]--`));
|
|
283
285
|
});
|
|
284
286
|
} else {
|
|
285
|
-
console.log(`[InfluxDB Tasks] - Could not get tasks from the InfluxDB API
|
|
287
|
+
console.log(chalk.magenta(`[InfluxDB Tasks] - Could not get tasks from the InfluxDB API`));
|
|
286
288
|
}
|
|
287
289
|
}
|
|
288
290
|
|
|
@@ -332,9 +334,9 @@ export class InfluxDBManager
|
|
|
332
334
|
|
|
333
335
|
this.#writeClient = null;
|
|
334
336
|
|
|
335
|
-
console.log(`ProducerDisconnect
|
|
337
|
+
console.log(chalk.yellow(`ProducerDisconnect`));
|
|
336
338
|
} catch (error) {
|
|
337
|
-
console.error(`${_logPrefix}#Terminate: Error: [${error}]
|
|
339
|
+
console.error(chalk.red(`${_logPrefix}#Terminate: Error: [${error}]`));
|
|
338
340
|
}
|
|
339
341
|
}
|
|
340
342
|
}
|
|
@@ -354,7 +356,7 @@ export class InfluxDBManager
|
|
|
354
356
|
});
|
|
355
357
|
return results;
|
|
356
358
|
} catch (error) {
|
|
357
|
-
console.error(`${_logPrefix}#CreateGlobalCountModel: Error: [${error}]
|
|
359
|
+
console.error(chalk.red(`${_logPrefix}#CreateGlobalCountModel: Error: [${error}]`));
|
|
358
360
|
}
|
|
359
361
|
}
|
|
360
362
|
|
|
@@ -428,13 +430,13 @@ export class InfluxDBManager
|
|
|
428
430
|
// https://influxdata.github.io/influxdb-client-js/influxdb-client.writeoptions.html and
|
|
429
431
|
// https://influxdata.github.io/influxdb-client-js/influxdb-client.writeretryoptions.html
|
|
430
432
|
writeFailed(error, lines, attempt, expires) {
|
|
431
|
-
debug(`writeOptions:writeSuccess(): Error: [${error}], Attempt: [${attempt}], Expires: [${expires}], Lines: [${lines}]
|
|
433
|
+
debug(chalk.red(`writeOptions:writeSuccess(): Error: [${error}], Attempt: [${attempt}], Expires: [${expires}], Lines: [${lines}]`));
|
|
432
434
|
},
|
|
433
435
|
writeSuccess(lines) {
|
|
434
|
-
debug(`writeOptions:writeSuccess(): Lines: [${lines}]
|
|
436
|
+
debug(chalk.green(`writeOptions:writeSuccess(): Lines: [${lines}]`));
|
|
435
437
|
},
|
|
436
438
|
writeRetrySkipped(entry) {
|
|
437
|
-
debug(`writeOptions:writeSuccess(): Expires: [${entry.expires}], Lines: [${entry.lines}]
|
|
439
|
+
debug(chalk.magenta(`writeOptions:writeSuccess(): Expires: [${entry.expires}], Lines: [${entry.lines}]`));
|
|
438
440
|
}
|
|
439
441
|
}
|
|
440
442
|
|
|
@@ -457,10 +459,10 @@ export class InfluxDBManager
|
|
|
457
459
|
attemptCount = 0;
|
|
458
460
|
StartWriteClient(normalFlushDelay);
|
|
459
461
|
} catch (error) {
|
|
460
|
-
console.error(`InfluxDBManager:StartWriteClient(): Attempt: [${attemptCount}], Error: [${error}]
|
|
462
|
+
console.error(chalk.red(`InfluxDBManager:StartWriteClient(): Attempt: [${attemptCount}], Error: [${error}]`));
|
|
461
463
|
if (attemptCount === maxAttemptCount) {
|
|
462
|
-
console.error(`InfluxDBManager:StartWriteClient(): Max Attempts reached. Will no longer retry
|
|
463
|
-
console.error(`InfluxDBManager:StartWriteClient(): InfluxDB data capture ended in permanent faiilure
|
|
464
|
+
console.error(chalk.red(`InfluxDBManager:StartWriteClient(): Max Attempts reached. Will no longer retry.`));
|
|
465
|
+
console.error(chalk.red(`InfluxDBManager:StartWriteClient(): InfluxDB data capture ended in permanent faiilure.`));
|
|
464
466
|
} else {
|
|
465
467
|
StartWriteClient(retryFlushDelay);
|
|
466
468
|
}
|
|
@@ -487,7 +489,7 @@ export class InfluxDBManager
|
|
|
487
489
|
return this.#influxDBManagerClients['service'].OutputInfluxDB(this.writeClient, instrumentPayload);
|
|
488
490
|
}
|
|
489
491
|
} catch (error) {
|
|
490
|
-
console.error(`${_logPrefix}OutputInfluxDB: Could not write data point: [${error}]
|
|
492
|
+
console.error(chalk.red(`${_logPrefix}OutputInfluxDB: Could not write data point: [${error}]`));
|
|
491
493
|
return false;
|
|
492
494
|
}
|
|
493
495
|
}
|
|
@@ -105,6 +105,8 @@ import { InfluxDBManagerBase } from './influxDBManagerBase'
|
|
|
105
105
|
import { IInfluxDBManagerOptions, InstrumentPayload } from './../commonTypes'
|
|
106
106
|
import { ISubscriptionPayload, ISubscriptionKey } from '@nsshunt/stssocketio-client'
|
|
107
107
|
|
|
108
|
+
import chalk from 'chalk';
|
|
109
|
+
|
|
108
110
|
const AGENT_STATS_BY_AGENT_THREAD_ASYNCRUNNER = "sts-stats-by-agentthreadasyncunner";
|
|
109
111
|
const AGENT_STATS_BY_AGENT_THREAD = "sts-stats-by-agentthread";
|
|
110
112
|
const AGENT_STATS_BY_AGENT = "sts-stats-by-agent";
|
|
@@ -138,7 +140,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
138
140
|
|
|
139
141
|
return this.queryApi.collectRows(query)
|
|
140
142
|
} catch (error) {
|
|
141
|
-
console.error(`${_logPrefix}#GetSTSCountGeneric: Error: [${error}]
|
|
143
|
+
console.error(chalk.red(`${_logPrefix}#GetSTSCountGeneric: Error: [${error}]`));
|
|
142
144
|
}
|
|
143
145
|
}
|
|
144
146
|
|
|
@@ -154,7 +156,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
154
156
|
|> difference()`;
|
|
155
157
|
return this.queryApi.collectRows(query)
|
|
156
158
|
} catch (error) {
|
|
157
|
-
console.error(`${_logPrefix}#GetSTSHistoGeneric: Error: [${error}]
|
|
159
|
+
console.error(chalk.red(`${_logPrefix}#GetSTSHistoGeneric: Error: [${error}]`));
|
|
158
160
|
}
|
|
159
161
|
}
|
|
160
162
|
|
|
@@ -183,7 +185,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
183
185
|
|
|
184
186
|
return this.queryApi.collectRows(query)
|
|
185
187
|
} catch (error) {
|
|
186
|
-
console.error(`${_logPrefix}#GetSTSQuantileGeneric: Error: [${error}]
|
|
188
|
+
console.error(chalk.red(`${_logPrefix}#GetSTSQuantileGeneric: Error: [${error}]`));
|
|
187
189
|
}
|
|
188
190
|
}
|
|
189
191
|
|
|
@@ -198,7 +200,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
198
200
|
this.#GetSTSHistoGenericService(AGENT_STATS_GLOBALAGENT, '')],
|
|
199
201
|
[ ])
|
|
200
202
|
} catch (error) {
|
|
201
|
-
console.error(`${_logPrefix}GetInfluxDBResultsRootAgent: Error: [${error}]
|
|
203
|
+
console.error(chalk.red(`${_logPrefix}GetInfluxDBResultsRootAgent: Error: [${error}]`));
|
|
202
204
|
}
|
|
203
205
|
return {
|
|
204
206
|
subscriptionKey,
|
|
@@ -216,7 +218,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
216
218
|
this.#GetSTSHistoGenericService(AGENT_STATS_BY_AGENT, '')],
|
|
217
219
|
['agentName'])
|
|
218
220
|
} catch (error) {
|
|
219
|
-
console.error(`${_logPrefix}GetInfluxDBResultsAgent: Error: [${error}]
|
|
221
|
+
console.error(chalk.red(`${_logPrefix}GetInfluxDBResultsAgent: Error: [${error}]`));
|
|
220
222
|
}
|
|
221
223
|
return {
|
|
222
224
|
subscriptionKey,
|
|
@@ -235,7 +237,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
235
237
|
this.#GetSTSHistoGenericService(AGENT_STATS_BY_AGENT_THREAD, `and r["agentName"] == "${agentName}"`)],
|
|
236
238
|
['agentName', 'threadId'])
|
|
237
239
|
} catch (error) {
|
|
238
|
-
console.error(`${_logPrefix}GetInfluxDBResultsAgentThreads: Error: [${error}]
|
|
240
|
+
console.error(chalk.red(`${_logPrefix}GetInfluxDBResultsAgentThreads: Error: [${error}]`));
|
|
239
241
|
}
|
|
240
242
|
return {
|
|
241
243
|
subscriptionKey,
|
|
@@ -255,7 +257,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
255
257
|
this.#GetSTSHistoGenericService(AGENT_STATS_BY_AGENT_THREAD_ASYNCRUNNER, `and r["agentName"] == "${agentName}" and r["threadId"] == "${threadId}"`)],
|
|
256
258
|
['agentName', 'threadId', 'asyncRunnerId'])
|
|
257
259
|
} catch (error) {
|
|
258
|
-
console.error(`${_logPrefix}GetInfluxDBResultsAgentThread: Error: [${error}]
|
|
260
|
+
console.error(chalk.red(`${_logPrefix}GetInfluxDBResultsAgentThread: Error: [${error}]`));
|
|
259
261
|
}
|
|
260
262
|
return {
|
|
261
263
|
subscriptionKey,
|
|
@@ -303,11 +305,11 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
303
305
|
writeApi.writePoint(point);
|
|
304
306
|
return true;
|
|
305
307
|
} catch (error: any) {
|
|
306
|
-
console.error(`${_logPrefix}OutputInfluxDBAgent: Could not write data point: [${error}]
|
|
308
|
+
console.error(chalk.red(`${_logPrefix}OutputInfluxDBAgent: Could not write data point: [${error}]`));
|
|
307
309
|
return false;
|
|
308
310
|
}
|
|
309
311
|
} else {
|
|
310
|
-
console.error(`${_logPrefix}OutputInfluxDBAgent: Could not write data point as writeClient is null
|
|
312
|
+
console.error(chalk.red(`${_logPrefix}OutputInfluxDBAgent: Could not write data point as writeClient is null`));
|
|
311
313
|
return false;
|
|
312
314
|
}
|
|
313
315
|
}
|
|
@@ -7,6 +7,8 @@ import { IInfluxDBManagerOptions, InstrumentPayload } from './../commonTypes'
|
|
|
7
7
|
|
|
8
8
|
import { JSONObject } from '@nsshunt/stsutils'
|
|
9
9
|
|
|
10
|
+
import chalk from 'chalk';
|
|
11
|
+
|
|
10
12
|
const _logPrefix = 'InfluxDBManager:'
|
|
11
13
|
|
|
12
14
|
export class InfluxDBManagerBase
|
|
@@ -74,7 +76,7 @@ export class InfluxDBManagerBase
|
|
|
74
76
|
}
|
|
75
77
|
return combinedResults;
|
|
76
78
|
} catch (error) {
|
|
77
|
-
console.error(`${_logPrefix}ProcessInfluxDBResults: Error: [${error}]
|
|
79
|
+
console.error(chalk.red(`${_logPrefix}ProcessInfluxDBResults: Error: [${error}]`));
|
|
78
80
|
}
|
|
79
81
|
}
|
|
80
82
|
|
|
@@ -86,7 +88,7 @@ export class InfluxDBManagerBase
|
|
|
86
88
|
});
|
|
87
89
|
return results;
|
|
88
90
|
} catch (error) {
|
|
89
|
-
console.error(`${_logPrefix}#CreateGlobalCountModel: Error: [${error}]
|
|
91
|
+
console.error(chalk.red(`${_logPrefix}#CreateGlobalCountModel: Error: [${error}]`));
|
|
90
92
|
}
|
|
91
93
|
}
|
|
92
94
|
|