Skip to content
This repository was archived by the owner on May 26, 2023. It is now read-only.

Commit 811ff6d

Browse files
authored
Add timestamp to console log (#363)
* Create custom logger with timestamps
1 parent d131e4c commit 811ff6d

File tree

4 files changed

+24
-7
lines changed

4 files changed

+24
-7
lines changed

server/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ const Koa = require('koa'),
99
passport = require('passport'),
1010
csrf = require('koa-csrf'),
1111
auth = require('./auth'),
12-
{ securityHeaders } = require('./middlewares');
12+
{ securityHeaders } = require('./middlewares'),
13+
logger = require('./logger');
1314

1415
app.webpackConfig = require('../webpack.config');
1516

@@ -45,7 +46,7 @@ app.init = function(options) {
4546
options.logErrors !== false &&
4647
(typeof err.statusCode !== 'number' || err.statusCode >= 500)
4748
) {
48-
console.error(err);
49+
logger.error(err);
4950
}
5051
ctx.status = err.statusCode || err.status || 500;
5152
ctx.body = { message: err.message };

server/logger.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const timeStamp = () => '[' + new Date().toISOString() + ']';
2+
3+
const withTimestamp = (fn, ...args) => {
4+
return fn.call(null, timeStamp(), ...args);
5+
};
6+
7+
const logger = {
8+
log: (...args) => withTimestamp(console.log, ...args),
9+
warn: (...args) => withTimestamp(console.warn, ...args),
10+
error: (...args) => withTimestamp(console.error, ...args),
11+
debug: (...args) => withTimestamp(console.debug, ...args),
12+
};
13+
14+
module.exports = logger;

server/temporal-client/helpers.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const Long = require('long');
22
const losslessJSON = require('lossless-json');
33
const moment = require('moment');
4+
const logger = require('../logger')
45

56
function buildHistory(getHistoryRes) {
67
const history = getHistoryRes.history;
@@ -130,7 +131,7 @@ function uiTransform(item, rawPayloads = false, transformingPayloads = false) {
130131

131132
payloads = [...payloads, data];
132133
} catch (error) {
133-
console.log(
134+
logger.log(
134135
`Unable to process payload. Encoding: ${encoding}, data: ${data}. ${error}`
135136
);
136137
payloads = [...payloads, data.toString()];

server/tls/tls.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const { readCredsFromCertFiles } = require('./read-creds-from-cert-files');
33
const { readCredsFromConfig } = require('./read-creds-from-config');
44
const { compareCaseInsensitive } = require('../utils');
55
const { getTlsConfig } = require('../config');
6+
const logger = require('../logger')
67

78
const keyPath = process.env.TEMPORAL_TLS_KEY_PATH;
89
const certPath = process.env.TEMPORAL_TLS_CERT_PATH;
@@ -14,25 +15,25 @@ const verifyHost = [true, 'true', undefined].includes(
1415
const tlsConfigFile = getTlsConfig()
1516
function getCredentials() {
1617
if (keyPath !== undefined && certPath !== undefined) {
17-
console.log('establishing secure connection using TLS cert files...');
18+
logger.log('establishing secure connection using TLS cert files...');
1819
const { pk, cert, ca } = readCredsFromCertFiles({
1920
keyPath,
2021
certPath,
2122
caPath,
2223
});
2324
return createSecure(pk, cert, ca, serverName, verifyHost);
2425
} else if (caPath !== undefined) {
25-
console.log('establishing server-side TLS connection using only TLS CA file...');
26+
logger.log('establishing server-side TLS connection using only TLS CA file...');
2627
const { ca } = readCredsFromCertFiles({ caPath });
2728
return createSecure(undefined, undefined, ca, serverName, verifyHost);
2829
} else if (tlsConfigFile.key) {
29-
console.log(
30+
logger.log(
3031
'establishing secure connection using TLS yml configuration...'
3132
);
3233
const { pk, cert, ca, serverName, verifyHost } = readCredsFromConfig();
3334
return createSecure(pk, cert, ca, serverName, verifyHost);
3435
} else {
35-
console.log('establishing insecure connection...');
36+
logger.log('establishing insecure connection...');
3637
return { credentials: grpc.credentials.createInsecure(), options: {} };
3738
}
3839
}

0 commit comments

Comments
 (0)