Skip to content

Commit 5439df4

Browse files
authored
Revert "HCK-11091: Move the log of the start of FE/RE to the studio (#30)" (#31)
<!--do not remove this marker, its needed to replace info when ticket title is updated --> <!--jira-description-action-hidden-marker-start--> <table> <td> <a href="https://hackolade.atlassian.net/browse/HCK-11091" title="HCK-11091" target="_blank"><img alt="Sub-task" src="https://hackolade.atlassian.net/rest/api/2/universal_avatar/view/type/issuetype/avatar/10316?size=medium" />HCK-11091</a> [Plugins] Remove the logging of system & connection information from every plugin </td></table> <br /> <!--jira-description-action-hidden-marker-end--> ## Content Temporarily revert to previous logging until the backward compatibility mechanism is implemented.
1 parent c8abfbf commit 5439df4

File tree

3 files changed

+61
-2
lines changed

3 files changed

+61
-2
lines changed

forward_engineering/helpers/applyToInstanceHelper.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const vm = require('vm');
22
const bson = require('bson');
33
const connectionHelper = require('../../shared/mongoDbClient');
4-
const { createLogger } = require('../../shared/logHelper');
4+
const { createLogger, getSystemInfo } = require('../../shared/logHelper');
55
const readNdJsonByLine = require('./ndJsonHelper');
66
const { getError } = require('../../shared/getError');
77

@@ -15,6 +15,10 @@ const applyToInstanceHelper = {
1515
});
1616

1717
try {
18+
logger.clear();
19+
log.info(getSystemInfo(data.appVersion));
20+
log.info(data);
21+
1822
const connection = await connectionHelper.connect(data, sshService);
1923

2024
const { scriptWithSamples, numberOfSamples } = await generateScriptForInsertingDataInBulk(
@@ -48,6 +52,10 @@ const applyToInstanceHelper = {
4852
});
4953

5054
try {
55+
logger.clear();
56+
log.info(getSystemInfo(connectionInfo.appVersion));
57+
log.info(connectionInfo, 'connectionInfo');
58+
5159
await connectionHelper.connect(connectionInfo, sshService);
5260
connectionHelper.close(sshService);
5361

reverse_engineering/api.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const async = require('async');
22
const bson = require('bson');
33
const connectionHelper = require('../shared/mongoDbClient');
4-
const { createLogger } = require('../shared/logHelper');
4+
const { createLogger, getSystemInfo } = require('../shared/logHelper');
55
const { getDocDbClientInstance } = require('../shared/getDocDbClientInstance');
66

77
module.exports = {
@@ -20,6 +20,10 @@ module.exports = {
2020
});
2121

2222
try {
23+
logger.clear();
24+
log.info(getSystemInfo(connectionInfo.appVersion));
25+
log.info(connectionInfo, 'connectionInfo');
26+
2327
await connectionHelper.connect(connectionInfo, sshService);
2428

2529
log.info('Connected successfully');
@@ -43,6 +47,10 @@ module.exports = {
4347
});
4448

4549
try {
50+
logger.clear();
51+
log.info(getSystemInfo(connectionInfo.appVersion));
52+
log.info(connectionInfo, 'connectionInfo');
53+
4654
const docDbClientInstance = await getDocDbClientInstance({
4755
connectionInfo: {
4856
...connectionInfo,

shared/logHelper.js

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,48 @@
11
const os = require('os');
22
const packageFile = require('../package.json');
33

4+
const getPluginVersion = () => packageFile.version;
5+
6+
const getSystemInfo = appVersion => {
7+
return (
8+
'' +
9+
`Date: ${new Date()}` +
10+
'\n' +
11+
`Application version: ${appVersion}` +
12+
'\n' +
13+
`Plugin version: ${getPluginVersion()}` +
14+
'\n\n' +
15+
`System information:` +
16+
'\n' +
17+
` Hostname: ${os.hostname()}` +
18+
'\n' +
19+
` Platform: ${os.platform()} ${os.arch()}` +
20+
'\n' +
21+
` Release: ${os.release()}` +
22+
'\n' +
23+
` Uptime: ${toTime(os.uptime())}` +
24+
'\n' +
25+
` Total RAM: ${(os.totalmem() / 1073741824).toFixed(2)} GB` +
26+
'\n' +
27+
` CPU Model: ${os.cpus()[0].model}` +
28+
'\n' +
29+
` CPU Clock: ${maxClock(os.cpus())} MHZ` +
30+
'\n' +
31+
` CPU Cores: ${os.cpus().length} cores` +
32+
'\n\n'
33+
);
34+
};
35+
36+
const maxClock = cpus => {
37+
return cpus.reduce((highestClock, cpu) => Math.max(highestClock, cpu.speed), 0);
38+
};
39+
40+
const prefixZero = number => (number < 10 ? '0' + number : number);
41+
42+
const toTime = number => {
43+
return Math.floor(number / 3600) + ':' + prefixZero(parseInt((number / 3600 - Math.floor(number / 3600)) * 60));
44+
};
45+
446
const createLogger = ({ title, logger, hiddenKeys }) => {
547
return {
648
info(message, infoTitle) {
@@ -29,4 +71,5 @@ const createError = error => {
2971

3072
module.exports = {
3173
createLogger,
74+
getSystemInfo,
3275
};

0 commit comments

Comments
 (0)