Skip to content

Emitter fix #90

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

Emitter fix #90

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
d7b167e
removed `emitter` member, changed everything to `this.emit`
ATGardner Jul 7, 2021
e69c3a0
updated version to 1.8.17
ATGardner Jul 7, 2021
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@codefresh-io/task-logger",
"version": "1.8.16",
"version": "1.8.17",
"description": "Codefresh utilities for working with build logs",
"main": "index.js",
"scripts": {
Expand Down
124 changes: 60 additions & 64 deletions taskLogger/mongo/StepLogger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
const _ = require('lodash');
const BaseStepLogger = require('../StepLogger');
const MongoTaskLogger = require('./TaskLogger');
const { STATUS } = require('../enums');
const MongoHelper = require('./mongoHelper');
const EventEmitter = require('events');

const _ = require('lodash');
const BaseStepLogger = require('../StepLogger');
const MongoTaskLogger = require('./TaskLogger');
const { STATUS } = require('../enums');
const MongoHelper = require('./mongoHelper');

class MongoStepLogger extends BaseStepLogger {
constructor(step, opts, taskLogger) {
super(step, opts, taskLogger);
this.db = MongoTaskLogger.getConnection(opts);
this.emitter = new EventEmitter();
}

async restore() {
const key = 'name';
const doc = await new Promise((resolve, reject) => {
this.db.collection(MongoHelper.getCollection(key)).find(this.getFilter())
.toArray((err, docs) => {
if (err) {
reject(err);
} else {
resolve(docs && docs[0]);
}
});
.toArray((err, docs) => {
if (err) {
reject(err);
} else {
resolve(docs && docs[0]);
}
});
});
const stepFromDoc = _.get(doc, `steps[${this.name}]`);
if (stepFromDoc) {
Expand All @@ -38,12 +35,12 @@ class MongoStepLogger extends BaseStepLogger {
return new Promise((resolve, reject) => {
this.db.collection(MongoHelper.getCollection('logs')).find(
where, { sort })
.toArray((err, docs) => {
if (err) {
reject(err);
}
resolve(docs);
});
.toArray((err, docs) => {
if (err) {
reject(err);
}
resolve(docs);
});
});

}
Expand All @@ -53,7 +50,7 @@ class MongoStepLogger extends BaseStepLogger {
this.db.collection(MongoHelper.getCollection(key)).insertOne(
this.getObjectToPush(key, message, syncId), (err) => {
if (err) {
this.emitter.emit('ERROR', err);
this.emit('error', err);
}
});
}
Expand All @@ -63,7 +60,7 @@ class MongoStepLogger extends BaseStepLogger {
this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.outputUrl } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
this.emit('error', err);
}
});
}
Expand All @@ -73,7 +70,7 @@ class MongoStepLogger extends BaseStepLogger {
this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.environmentName } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
this.emit('error', err);
}
});
}
Expand All @@ -83,7 +80,7 @@ class MongoStepLogger extends BaseStepLogger {
this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.environmentId } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
this.emit('error', err);
}
});
}
Expand All @@ -93,67 +90,67 @@ class MongoStepLogger extends BaseStepLogger {
this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.activityId } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
this.emit('error', err);
}
});
}

_reportLastUpdate() {
const key = `steps.${this.name}.lastUpdate`;
this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.lastUpdate } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
}
});
{ $set: { [key]: this.lastUpdate } }, { upsert: true }, (err) => {
if (err) {
this.emit('error', err);
}
});
}

_reportPrevioulyExecuted() {
const key = `steps.${this.name}.previouslyExecuted`;
this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.previouslyExecuted } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
}
});
{ $set: { [key]: this.previouslyExecuted } }, { upsert: true }, (err) => {
if (err) {
this.emit('error', err);
}
});
}

async _reportStatus() {
const key = `steps.${this.name}.status`;
return this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.status } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
}
});
{ $set: { [key]: this.status } }, { upsert: true }, (err) => {
if (err) {
this.emit('error', err);
}
});
}

async _reportFinishTimestamp() {
const key = `steps.${this.name}.finishTimeStamp`;
return this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.finishTimeStamp } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
}
});
{ $set: { [key]: this.finishTimeStamp } }, { upsert: true }, (err) => {
if (err) {
this.emit('error', err);
}
});
}

_reportCreationTimestamp() {
const key = `steps.${this.name}.creationTimeStamp`;
this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.creationTimeStamp } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
}
});
{ $set: { [key]: this.creationTimeStamp } }, { upsert: true }, (err) => {
if (err) {
this.emit('error', err);
}
});
}

_reportMemoryUsage(time, memoryUsage, syncId) {
const key = 'metrics.memory';
this.db.collection(MongoHelper.getCollection(key)).insertOne(
this.getObjectToPush(key, { time, usage: memoryUsage }, syncId), (err) => {
if (err) {
this.emitter.emit('ERROR', err);
this.emit('error', err);
}
});
}
Expand All @@ -163,29 +160,29 @@ class MongoStepLogger extends BaseStepLogger {
this.db.collection(MongoHelper.getCollection(key)).insertOne(
this.getObjectToPush(key, { time, usage: cpuUsage }, syncId), (err) => {
if (err) {
this.emitter.emit('ERROR', err);
this.emit('error', err);
}
});
}

_reportLogSize() {
const key = `steps.${this.name}.metrics.logs.total`;
this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.logSize } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
}
});
{ $set: { [key]: this.logSize } }, { upsert: true }, (err) => {
if (err) {
this.emit('error', err);
}
});
}

reportName() {
const key = `steps.${this.name}.name`;
this.db.collection(MongoHelper.getCollection(key)).updateOne(this.getFilter(),
{ $set: { [key]: this.name } }, { upsert: true }, (err) => {
if (err) {
this.emitter.emit('ERROR', err);
}
});
{ $set: { [key]: this.name } }, { upsert: true }, (err) => {
if (err) {
this.emit('error', err);
}
});
}

clearLogs() {
Expand All @@ -212,7 +209,6 @@ class MongoStepLogger extends BaseStepLogger {
jobId: this.jobId
};
}

}

module.exports = MongoStepLogger;
Loading