public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkg/api: Check errors (#19657)

Browse Source 
* pkg/api: Check errors
* pkg/api: Remove unused function HashEmail
This commit is contained in:
Arve Knudsen
2019-10-08 18:57:53 +02:00
committed by GitHub
parent dabc848e11
commit 0a2d5e16dd
12 changed files with 86 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/http_server.go
+9 -4
View File
@@ -125,16 +125,19 @@ func (hs *HTTPServer) Run(ctx context.Context) error {
case setting.SOCKET:
ln, err := net.ListenUnix("unix", &net.UnixAddr{Name: setting.SocketPath, Net: "unix"})
if err != nil {
hs.log.Debug("server was shutdown gracefully")
hs.log.Debug("server was shutdown gracefully", "err", err)
return nil
}
// Make socket writable by group
os.Chmod(setting.SocketPath, 0660)
if err := os.Chmod(setting.SocketPath, 0660); err != nil {
hs.log.Debug("server was shutdown gracefully", "err", err)
return nil
}
err = hs.httpSrv.Serve(ln)
if err != nil {
hs.log.Debug("server was shutdown gracefully")
hs.log.Debug("server was shutdown gracefully", "err", err)
return nil
}
default:
@@ -340,7 +343,9 @@ func (hs *HTTPServer) healthHandler(ctx *macaron.Context) {
}
dataBytes, _ := data.EncodePretty()
ctx.Resp.Write(dataBytes)
if _, err := ctx.Resp.Write(dataBytes); err != nil {
hs.log.Error("Failed to write to response", "err", err)
}
}
func (hs *HTTPServer) mapStatic(m *macaron.Macaron, rootDir string, dir string, prefix string) {