Skip to content

Consistent logging #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Consistent logging #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d6bf73
Consistent logging
zubairov Feb 11, 2019
2a46a36
Merge branch 'master' into zubairov_log_improvements
Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions lib/executor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
var EventEmitter = require('events').EventEmitter;
var _ = require('lodash');
var util = require('util');
const EventEmitter = require('events').EventEmitter;
const _ = require('lodash');
const util = require('util');
const log = require('./logging.js');


exports.TaskExec = TaskExec;

Expand All @@ -13,7 +15,7 @@ util.inherits(TaskExec, EventEmitter);

TaskExec.prototype.process = function process(triggerOrAction, payload, cfg, snapshot) {
//eslint-disable-next-line consistent-this
var self = this;
const self = this;
if (!_.isFunction(triggerOrAction.process)) {
return onError(new Error('Process function is not found'));
}
Expand All @@ -28,7 +30,7 @@ TaskExec.prototype.process = function process(triggerOrAction, payload, cfg, sna

function onPromisedData(data) {
if (data) {
console.log('Process function is a Promise/generator/etc');
log.debug('Process function is a Promise/generator/etc');
self.emit('data', data);
}
self.emit('end');
Expand Down
18 changes: 9 additions & 9 deletions lib/sailor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const assert = require('assert');
const co = require('co');
const uuid = require('uuid');

const TIMEOUT = process.env.ELASTICIO_TIMEOUT || 20 * 60 * 1000; // 20 minutes
const TIMEOUT = process.env.ELASTICIO_TIMEOUT || 60 * 60 * 1000; // 60 minutes
const AMQP_HEADER_META_PREFIX = 'x-eio-meta-';
const AMQP_HEADER_TRACE_ID = AMQP_HEADER_META_PREFIX + 'trace-id';

Expand Down Expand Up @@ -194,7 +194,7 @@ class Sailor {
const messageId = message.properties.headers.messageId || 'unknown';
const parentMessageId = message.properties.headers.parentMessageId || 'unknown';
const deliveryTag = message.fields.deliveryTag;
log.info({
log.debug({
deliveryTag,
messageId,
parentMessageId,
Expand Down Expand Up @@ -242,7 +242,7 @@ class Sailor {
let endWasEmitted;

function onTimeout() {
log.info({
log.warn({
deliveryTag,
messageId,
parentMessageId,
Expand Down Expand Up @@ -273,7 +273,7 @@ class Sailor {

function onData(data) {
const headers = _.clone(outgoingMessageHeaders);
log.info({
log.debug({
deliveryTag,
messageId,
parentMessageId,
Expand All @@ -299,7 +299,7 @@ class Sailor {
function onHttpReply(reply) {
const headers = _.clone(outgoingMessageHeaders);
const props = createAmqpProperties(headers);
log.info({
log.debug({
deliveryTag,
messageId,
parentMessageId,
Expand All @@ -314,7 +314,7 @@ class Sailor {
const headers = _.clone(outgoingMessageHeaders);
err = formatError(err);
taskExec.errorCount++;
log.info({
log.debug({
deliveryTag,
messageId,
parentMessageId,
Expand All @@ -331,7 +331,7 @@ class Sailor {
function onRebound(err) {
const headers = _.clone(outgoingMessageHeaders);
err = formatError(err);
log.info({
log.debug({
deliveryTag,
messageId,
parentMessageId,
Expand Down Expand Up @@ -371,7 +371,7 @@ class Sailor {
}

function onUpdateKeys(keys) {
log.info({
log.debug({
deliveryTag,
messageId,
parentMessageId,
Expand Down Expand Up @@ -420,7 +420,7 @@ class Sailor {
self.amqpConnection.ack(message);
}
self.messagesCount -= 1;
log.info({
log.debug({
deliveryTag,
messageId,
parentMessageId,
Expand Down