Skip to content

Commit 744c259

Browse files
committed
Added log about system information
1 parent 1333935 commit 744c259

File tree

3 files changed

+59
-8
lines changed

3 files changed

+59
-8
lines changed

forward_engineering/api.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const reApi = require('../reverse_engineering/api');
2-
const { createLogger } = require('../reverse_engineering/helpers/loggerHelper');
2+
const { createLogger, getSystemInfo } = require('../reverse_engineering/helpers/loggerHelper');
33
const applyToInstanceHelper = require('./applyToInstanceHelper');
44

55
module.exports = {
@@ -10,6 +10,7 @@ module.exports = {
1010
},
1111
applyToInstance(connectionInfo, logger, callback, app) {
1212
logger.clear();
13+
logger.log('info', getSystemInfo(connectionInfo.appVersion), 'Apply to instance');
1314
logger.log(
1415
'info',
1516
app.require('lodash').omit(connectionInfo, 'script', 'containerData'),

reverse_engineering/api.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const { createLogger } = require('./helpers/loggerHelper');
3+
const { createLogger, getSystemInfo } = require('./helpers/loggerHelper');
44
const postgresService = require('./helpers/postgresService');
55

66
module.exports = {
@@ -12,8 +12,7 @@ module.exports = {
1212

1313
async testConnection(connectionInfo, logger, callback, app) {
1414
try {
15-
logger.clear();
16-
logger.log('info', connectionInfo, 'connectionInfo', connectionInfo.hiddenKeys);
15+
logInfo('Test connection', connectionInfo, logger);
1716

1817
const postgresLogger = createLogger({
1918
title: 'Test connection instance log',
@@ -35,8 +34,7 @@ module.exports = {
3534

3635
async getDatabases(connectionInfo, logger, cb, app) {
3736
try {
38-
logger.clear();
39-
logger.log('info', connectionInfo, 'connectionInfo', connectionInfo.hiddenKeys);
37+
logInfo('Get databases', connectionInfo, logger);
4038

4139
const postgresLogger = createLogger({
4240
title: 'Get DB names',
@@ -63,8 +61,7 @@ module.exports = {
6361

6462
async getDbCollectionsNames(connectionInfo, logger, callback, app) {
6563
try {
66-
logger.clear();
67-
logger.log('info', connectionInfo, 'connectionInfo', connectionInfo.hiddenKeys);
64+
logInfo('Get DB table names', connectionInfo, logger);
6865

6966
const postgresLogger = createLogger({
7067
title: 'Get DB collections names',
@@ -204,3 +201,9 @@ const prepareError = error => {
204201
error = JSON.parse(error);
205202
return error;
206203
};
204+
205+
const logInfo = (step, connectionInfo, logger) => {
206+
logger.clear();
207+
logger.log('info', getSystemInfo(connectionInfo.appVersion), step);
208+
logger.log('info', connectionInfo, 'connectionInfo', connectionInfo.hiddenKeys);
209+
};

reverse_engineering/helpers/loggerHelper.js

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
const os = require('os');
2+
const net = require('net');
3+
const packageFile = require('../../package.json');
4+
15
const createLogger = ({ title, logger, hiddenKeys }) => {
26
return {
37
info(message, additionalData = {}) {
@@ -20,6 +24,49 @@ const prepareError = error => {
2024
return error;
2125
};
2226

27+
const getPluginVersion = () => packageFile.version;
28+
29+
const getSystemInfo = appVersion => {
30+
return (
31+
'' +
32+
`Date: ${new Date()}` +
33+
'\n' +
34+
`Application version: ${appVersion}` +
35+
'\n' +
36+
`Plugin version: ${getPluginVersion()}` +
37+
'\n\n' +
38+
`System information:` +
39+
'\n' +
40+
` Hostname: ${os.hostname()}` +
41+
'\n' +
42+
` Platform: ${os.platform()} ${os.arch()}` +
43+
'\n' +
44+
` Release: ${os.release()}` +
45+
'\n' +
46+
` Uptime: ${toTime(os.uptime())}` +
47+
'\n' +
48+
` Total RAM: ${(os.totalmem() / 1073741824).toFixed(2)} GB` +
49+
'\n' +
50+
` CPU Model: ${os.cpus()[0].model}` +
51+
'\n' +
52+
` CPU Clock: ${maxClock(os.cpus())} MHZ` +
53+
'\n' +
54+
` CPU Cores: ${os.cpus().length} cores` +
55+
'\n\n'
56+
);
57+
};
58+
59+
const maxClock = cpus => {
60+
return cpus.reduce((highestClock, cpu) => Math.max(highestClock, cpu.speed), 0);
61+
};
62+
63+
const prefixZero = number => (number < 10 ? '0' + number : number);
64+
65+
const toTime = number => {
66+
return Math.floor(number / 3600) + ':' + prefixZero(parseInt((number / 3600 - Math.floor(number / 3600)) * 60));
67+
};
68+
2369
module.exports = {
2470
createLogger,
71+
getSystemInfo,
2572
};

0 commit comments

Comments
 (0)