scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-08 11:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move some things around, fix linter warnings.

Browse source
This commit is contained in:
Cody Soyland 2020-04-14 16:57:36 -05:00
parent a66ee26a6b
commit 2155d6cab8
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
server/server.go
View file

@ -416,14 +416,23 @@ func (m *Command) setupNetworking() error {
}
// setupLogger sets up the logger based on the configuration.
func (m *Command) setupLogger() error {
func (m *Command) setupLogger() (err error) {
var f *reopen.FileWriter
if m.Config.LogPath == "" {
m.logOutput = m.Stderr
} else {
f, err := reopen.NewFileWriter(m.Config.LogPath)
f, err = reopen.NewFileWriter(m.Config.LogPath)
if err != nil {
return errors.Wrap(err, "opening file")
}
m.logOutput = f
}
if m.Config.Verbose {
m.logger = logger.NewVerboseLogger(m.logOutput)
} else {
m.logger = logger.NewStandardLogger(m.logOutput)
}
if m.Config.LogPath != "" {
sighup := make(chan os.Signal, 1)
signal.Notify(sighup, syscall.SIGHUP)
go func() {
@ -431,21 +440,17 @@ func (m *Command) setupLogger() error {
// duplicate stderr onto log file
err = m.dup(int(f.Fd()), int(os.Stderr.Fd()))
if err != nil {
io.WriteString(f, "syscall dup error: "+err.Error())
m.logger.Printf("syscall dup: %s\n", err.Error())
}
// reopen log file on SIGHUP
<-sighup
f.Reopen()
err = f.Reopen()
if err != nil {
m.logger.Printf("reopen: %s\n", err.Error())
}
}
}()
m.logOutput = f
}
if m.Config.Verbose {
m.logger = logger.NewVerboseLogger(m.logOutput)
} else {
m.logger = logger.NewStandardLogger(m.logOutput)
}
return nil
}