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

Commit

Permalink
Add timestamp to console log (#363)
Browse files Browse the repository at this point in the history
* Create custom logger with timestamps
  • Loading branch information
feedmeapples authored Jul 20, 2021
1 parent d131e4c commit 811ff6d
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 7 deletions.
5 changes: 3 additions & 2 deletions server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const Koa = require('koa'),
passport = require('passport'),
csrf = require('koa-csrf'),
auth = require('./auth'),
{ securityHeaders } = require('./middlewares');
{ securityHeaders } = require('./middlewares'),
logger = require('./logger');

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

Expand Down Expand Up @@ -45,7 +46,7 @@ app.init = function(options) {
options.logErrors !== false &&
(typeof err.statusCode !== 'number' || err.statusCode >= 500)
) {
console.error(err);
logger.error(err);
}
ctx.status = err.statusCode || err.status || 500;
ctx.body = { message: err.message };
Expand Down
14 changes: 14 additions & 0 deletions server/logger.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const timeStamp = () => '[' + new Date().toISOString() + ']';

const withTimestamp = (fn, ...args) => {
return fn.call(null, timeStamp(), ...args);
};

const logger = {
log: (...args) => withTimestamp(console.log, ...args),
warn: (...args) => withTimestamp(console.warn, ...args),
error: (...args) => withTimestamp(console.error, ...args),
debug: (...args) => withTimestamp(console.debug, ...args),
};

module.exports = logger;
3 changes: 2 additions & 1 deletion server/temporal-client/helpers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const Long = require('long');
const losslessJSON = require('lossless-json');
const moment = require('moment');
const logger = require('../logger')

function buildHistory(getHistoryRes) {
const history = getHistoryRes.history;
Expand Down Expand Up @@ -130,7 +131,7 @@ function uiTransform(item, rawPayloads = false, transformingPayloads = false) {

payloads = [...payloads, data];
} catch (error) {
console.log(
logger.log(
`Unable to process payload. Encoding: ${encoding}, data: ${data}. ${error}`
);
payloads = [...payloads, data.toString()];
Expand Down
9 changes: 5 additions & 4 deletions server/tls/tls.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const { readCredsFromCertFiles } = require('./read-creds-from-cert-files');
const { readCredsFromConfig } = require('./read-creds-from-config');
const { compareCaseInsensitive } = require('../utils');
const { getTlsConfig } = require('../config');
const logger = require('../logger')

const keyPath = process.env.TEMPORAL_TLS_KEY_PATH;
const certPath = process.env.TEMPORAL_TLS_CERT_PATH;
Expand All @@ -14,25 +15,25 @@ const verifyHost = [true, 'true', undefined].includes(
const tlsConfigFile = getTlsConfig()
function getCredentials() {
if (keyPath !== undefined && certPath !== undefined) {
console.log('establishing secure connection using TLS cert files...');
logger.log('establishing secure connection using TLS cert files...');
const { pk, cert, ca } = readCredsFromCertFiles({
keyPath,
certPath,
caPath,
});
return createSecure(pk, cert, ca, serverName, verifyHost);
} else if (caPath !== undefined) {
console.log('establishing server-side TLS connection using only TLS CA file...');
logger.log('establishing server-side TLS connection using only TLS CA file...');
const { ca } = readCredsFromCertFiles({ caPath });
return createSecure(undefined, undefined, ca, serverName, verifyHost);
} else if (tlsConfigFile.key) {
console.log(
logger.log(
'establishing secure connection using TLS yml configuration...'
);
const { pk, cert, ca, serverName, verifyHost } = readCredsFromConfig();
return createSecure(pk, cert, ca, serverName, verifyHost);
} else {
console.log('establishing insecure connection...');
logger.log('establishing insecure connection...');
return { credentials: grpc.credentials.createInsecure(), options: {} };
}
}
Expand Down

0 comments on commit 811ff6d

Please sign in to comment.