-
Notifications
You must be signed in to change notification settings - Fork 7
Consolidate logger initialization to use generic helpers #815
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
Merged
+143
−24
Merged
Changes from all commits
Commits
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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -17,9 +17,9 @@ package logger | |
| import "sync" | ||
|
|
||
| // closableLogger is a constraint for types that have a Close method. | ||
| // This is satisfied by *FileLogger, *JSONLLogger, and *MarkdownLogger. | ||
| // This is satisfied by *FileLogger, *JSONLLogger, *MarkdownLogger, and *ServerFileLogger. | ||
| type closableLogger interface { | ||
| *FileLogger | *JSONLLogger | *MarkdownLogger | ||
| *FileLogger | *JSONLLogger | *MarkdownLogger | *ServerFileLogger | ||
| Close() error | ||
|
Comment on lines
19
to
23
|
||
| } | ||
|
|
||
|
|
@@ -113,3 +113,13 @@ func initGlobalMarkdownLogger(logger *MarkdownLogger) { | |
| func closeGlobalMarkdownLogger() error { | ||
| return closeGlobalLogger(&globalMarkdownMu, &globalMarkdownLogger) | ||
| } | ||
|
|
||
| // initGlobalServerFileLogger initializes the global ServerFileLogger using the generic helper. | ||
| func initGlobalServerFileLogger(logger *ServerFileLogger) { | ||
| initGlobalLogger(&globalServerLoggerMu, &globalServerFileLogger, logger) | ||
| } | ||
|
|
||
| // closeGlobalServerFileLogger closes the global ServerFileLogger using the generic helper. | ||
| func closeGlobalServerFileLogger() error { | ||
| return closeGlobalLogger(&globalServerLoggerMu, &globalServerFileLogger) | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
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.
The documentation says "All logger types use the initLogger() generic helper" but later in the same section notes that ServerFileLogger does not use initLogger() (it creates files on-demand). Please reword this to avoid the contradiction (e.g., specify which logger types use initLogger()).
This issue also appears on line 182 of the same file.