Skip to content

Pass name to logentries client and only init once #69

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 1 commit into from
Jan 24, 2017
Merged

Pass name to logentries client and only init once #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ function getStreams(config) {
streams.push({
name: 'logentries',
level: config.level,
stream: new ClientLogentriesLogger({ token: config.logentriesToken }),
stream: new ClientLogentriesLogger({
name: config.name,
token: config.logentriesToken
}),
type: 'raw'
});
}
Expand Down
1 change: 1 addition & 0 deletions src/node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ function getStreams(config) {
// Transport server logs
if (config.logentriesToken) {
streams.push(new ServerLogentriesLogger({
name: config.name,
token: config.logentriesToken,
level: config.level
}));
Expand Down
19 changes: 13 additions & 6 deletions src/util/client/logentriesLogger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,19 @@ import LE from 'le_js';
* @param {String} options.token
* @param {String} options.level
*/
export default function ClientLogentriesLogger({ token }) {
LE.init({
token,
no_format: true,
page_info: 'per-page'
});
export default function ClientLogentriesLogger({ name, token }) {
try {
// If a LE logger does not exist with this name, this will throw
LE.to(name);
Copy link
Contributor Author

@nason nason Jan 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This goes down this path: https://github.com/rapid7/le_js/blob/master/src/le.js#L342

The issue we're seeing comes from the init call being made for every logger instance (including children) when a logentries token is present. This was introduced by the refactor in #68

} catch (err) {
// Init the LE logger
LE.init({
name,
token,
no_format: true,
page_info: 'per-page'
});
}
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/util/server/logentriesLogger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import Logentries from 'le_node';
* @param {String} options.level
* @returns {Object} - bunyan stream config
*/
export default function ServerLogentriesLogger({ token, level }) {
export default function ServerLogentriesLogger({ name, token, level }) {
const loggerDefinition = Logentries.bunyanStream({
name,
token,
secure: true,
withStack: true
Expand Down