-
Notifications
You must be signed in to change notification settings - Fork 395
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.
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
Fix #405 by providing a better way to configure logger #406
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -155,20 +155,28 @@ export default class App { | |
botId = undefined, | ||
botUserId = undefined, | ||
authorize = undefined, | ||
logger = new ConsoleLogger(), | ||
logLevel = LogLevel.INFO, | ||
logger = undefined, | ||
logLevel = undefined, | ||
ignoreSelf = true, | ||
clientOptions = undefined, | ||
}: AppOptions = {}) { | ||
|
||
this.logger = logger; | ||
this.logger.setLevel(logLevel); | ||
if (typeof logger === 'undefined') { | ||
// Initialize with the default logger | ||
const consoleLogger = new ConsoleLogger(); | ||
consoleLogger.setName('bolt-app'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If someone has suggestions for the default name, leave comments here. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seems fine to me |
||
this.logger = consoleLogger; | ||
} else { | ||
this.logger = logger; | ||
} | ||
if (typeof logLevel !== 'undefined' && this.logger.getLevel() !== logLevel) { | ||
this.logger.setLevel(logLevel); | ||
} | ||
this.errorHandler = defaultErrorHandler(this.logger); | ||
|
||
this.clientOptions = { | ||
agent, | ||
logLevel, | ||
logger, | ||
// App propagates only the log level to WebClient as WebClient has its own logger | ||
logLevel: this.logger.getLevel(), | ||
tls: clientTls, | ||
slackApiUrl: clientOptions !== undefined ? clientOptions.slackApiUrl : undefined, | ||
}; | ||
|
@@ -208,7 +216,13 @@ export default class App { | |
); | ||
} else { | ||
// Create default ExpressReceiver | ||
this.receiver = new ExpressReceiver({ signingSecret, logger, endpoints, agent, clientTls }); | ||
this.receiver = new ExpressReceiver({ | ||
signingSecret, | ||
endpoints, | ||
agent, | ||
clientTls, | ||
logger: this.logger, | ||
}); | ||
} | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we still setting
LogLevel.INFO
as the default somewhere? Looks like we lost that logic.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The default is INFO - https://github.com/slackapi/node-slack-sdk/blob/%40slack/logger%402.0.0/packages/logger/src/index.ts#L90
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay rad!