scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-06 19:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

return log err too

Browse source
This commit is contained in:
Yuce Tekol 2017-04-05 21:35:30 +03:00
parent 2a87c6783a
commit 6c7b1b513a
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server/server.go
View file

@ -116,13 +116,17 @@ func normalizeHost(host string) (string, error) {
// Close shuts down the server.
func (m *Command) Close() error {
err := m.Server.Close()
var logErr error
serveErr := m.Server.Close()
logOutput := m.Server.LogOutput
if logOutput != m.Stderr {
if file, ok := logOutput.(*os.File); ok {
file.Close()
}
if closer, ok := logOutput.(io.Closer); ok {
logErr = closer.Close()
}
close(m.Done)
return err
if serveErr != nil && logErr != nil {
return fmt.Errorf("closing server: '%v', closing logs: '%v'", serveErr, logErr)
} else if logErr != nil {
return logErr
}
return serveErr
}