@nsshunt/stsappframework 3.0.30 → 3.0.31

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.
Files changed (4) hide show
  1. package/dist/kafka/IMKafkaManager.js +2 -2
  2. package/dist/kafka/IMKafkaManager.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/kafka/IMKafkaManager.ts +2 -2
package/dist/kafka/IMKafkaManager.js CHANGED
@@ -115,11 +115,11 @@ class IMKafkaManager {
115
115
  const { serviceInstanceId, serviceInstanceProcessId, pid, ppid } = instrumentPayload.context;
116
116
  if (serviceInstanceId && serviceInstanceProcessId && pid && ppid) {
117
117
  // Output to the specific thread within an instance
118
- topic = `${commonTypes_1.KAFKA_PREFIX}_${serviceInstanceId}_${serviceInstanceProcessId}`.replace(/@/g, '_');
118
+ topic = `${commonTypes_1.KAFKA_PREFIX}_${serviceInstanceId}_${serviceInstanceProcessId}`.replace(/@/g, '_').replace(/\|/g, '_');
119
119
  this.#OutputLogsToKafkaTopic(topic, loggerMessages); // no need to await this ...
120
120
  if (pid === ppid) {
121
121
  // Output only to the main thread on the service, i.e. this is for O/A service logging
122
- topic = `${commonTypes_1.KAFKA_PREFIX}_${serviceInstanceId}`.replace(/@/g, '_');
122
+ topic = `${commonTypes_1.KAFKA_PREFIX}_${serviceInstanceId}`.replace(/@/g, '_').replace(/\|/g, '_');
123
123
  this.#OutputLogsToKafkaTopic(topic, loggerMessages); // no need to await this ...
124
124
  }
125
125
  }
package/dist/kafka/IMKafkaManager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IMKafkaManager.js","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"IMKafkaManager.js","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nsshunt/stsappframework",
3
- "version": "3.0.30",
3
+ "version": "3.0.31",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "./types/index.d.ts",
package/src/kafka/IMKafkaManager.ts CHANGED
@@ -129,12 +129,12 @@ export class IMKafkaManager {
129
129
  const { serviceInstanceId, serviceInstanceProcessId, pid, ppid } = instrumentPayload.context;
130
130
  if (serviceInstanceId && serviceInstanceProcessId && pid && ppid) {
131
131
  // Output to the specific thread within an instance
132
- topic = `${KAFKA_PREFIX}_${serviceInstanceId}_${serviceInstanceProcessId}`.replace(/@/g, '_');
132
+ topic = `${KAFKA_PREFIX}_${serviceInstanceId}_${serviceInstanceProcessId}`.replace(/@/g, '_').replace(/\|/g, '_');
133
133
  this.#OutputLogsToKafkaTopic(topic, loggerMessages); // no need to await this ...
134
134
 
135
135
  if (pid === ppid) {
136
136
  // Output only to the main thread on the service, i.e. this is for O/A service logging
137
- topic = `${KAFKA_PREFIX}_${serviceInstanceId}`.replace(/@/g, '_');
137
+ topic = `${KAFKA_PREFIX}_${serviceInstanceId}`.replace(/@/g, '_').replace(/\|/g, '_');
138
138
  this.#OutputLogsToKafkaTopic(topic, loggerMessages); // no need to await this ...
139
139
  }
140
140
  }