Skip to content

logging bug fix (configure not defined) #30

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

Merged
merged 9 commits into from
May 8, 2018
Merged

logging bug fix (configure not defined) #30

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e5b7e7a
Updated chunkEventStream.js to allow for skips
Feb 28, 2018
5b2d6eb
Merge pull request #8 from mrn3/patch-2
zirkerc Mar 5, 2018
da50401
Merge branch 'master' of github.com:LeoPlatform/Nodejs into HEAD
Handyman Apr 13, 2018
9d4d338
Merge pull request #27 from LeoPlatform/development
Handyman Apr 18, 2018
5fe0f42
Merge pull request #28 from LeoPlatform/development
Handyman Apr 19, 2018
131bfca
Expose the logger instance
seriouscoderone May 8, 2018
eed34b4
Revert "Expose the logger instance"
seriouscoderone May 8, 2018
6d3a19b
logging bug fix (configure not defined)
seriouscoderone May 8, 2018
ef3b365
Merge branch 'development' into logging-updates
seriouscoderone May 8, 2018
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
15 changes: 10 additions & 5 deletions lib/logging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ var https = require("https");
var moment = require("moment");
var uuid = require("uuid");

const accessor = {};

module.exports = function (id, opts) {

opts = Object.assign({
Expand All @@ -24,7 +26,7 @@ module.exports = function (id, opts) {
keepAlive: true
})
},
credentials: configure.credentials
credentials: opts.credentials
});

var configFile = path.resolve(os.tmpdir(), `leolog_${id.toString()}.json`);
Expand Down Expand Up @@ -125,14 +127,15 @@ module.exports = function (id, opts) {
config.sequenceNumber = data.nextSequenceToken;
fs.writeFile(configFile, JSON.stringify(config, null, 2), callback);
}
})
});
logs = [];
}

});
}

var logger = {
sendEvents,
end: function (callback) {
process.stdout.write = oldStdOut;
process.stderr.write = oldStdErr;
Expand All @@ -149,7 +152,7 @@ module.exports = function (id, opts) {
process.once("beforeExit", () => {
logger.end((err) => {
if (err) {
console.log("Error uploading logs to aws:", err)
console.log("Error uploading logs to aws:", err);
}
console.log("Finished uploading logs", config.logGroupName);
});
Expand All @@ -159,6 +162,8 @@ module.exports = function (id, opts) {
// By catching and logging the error it adds to the event loop and causes "beforeExit" to fire
console.error(err);
});

accessor.logger = logger;
return logger;
};
};

module.exports.accessor = accessor;