Skip to content

fix: check for nil Out in Logger on Close() #847

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
oidq wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −2
Open

fix: check for nil Out in Logger on Close() #847

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
9 changes: 9 additions & 0 deletions framework/log/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,15 @@ func (l *Logger) Write(s []byte) (int, error) {
return len(s), nil
}

// Close closes underlying output in Out.
func (l *Logger) Close() error {
if l.Out == nil {
return nil
}

return l.Out.Close()
}

// DebugWriter returns a writer that will act like Logger.Write
// but will use debug flag on messages. If Logger.Debug is false,
// Write method of returned object will be no-op.
Expand Down
4 changes: 2 additions & 2 deletions maddy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ func moduleMain(configPath string) error {
c.DefaultLogger.Msg("server stopped")

if c.DefaultLogger.Out != nil {
if err := c.DefaultLogger.Out.Close(); err != nil {
if err := c.DefaultLogger.Close(); err != nil {
log.DefaultLogger.Error("failed to close output logger", err)
}
}
Expand Down Expand Up @@ -517,7 +517,7 @@ func moduleReload(oldContainer *container.C, configPath string, asyncStopWg *syn
oldContainer.DefaultLogger.Error("moduleStop failed", err)
}
oldContainer.DefaultLogger.Msg("old server stopped")
if err := oldContainer.DefaultLogger.Out.Close(); err != nil {
if err := oldContainer.DefaultLogger.Close(); err != nil {
newContainer.DefaultLogger.Error("failed to close old server log", err)
}

Expand Down