Stowage/rest-server
2
0
Fork 0
mirror of https://github.com/restic/rest-server.git synced 2025-10-19 07:33:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Slightly improve error handling

Browse source 
Pass errors from Cobra runRoot() to main().
This commit is contained in:
Zlatko Čalušić 2017-07-30 17:45:23 +02:00
parent a628c4e01a
commit 57ca1d7d6e
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/rest-server/main.go
View file

@ -42,10 +42,10 @@ func runRoot(cmd *cobra.Command, args []string) error {
if restserver.Config.CPUProfile != "" { if restserver.Config.CPUProfile != "" {
f, err := os.Create(restserver.Config.CPUProfile) f, err := os.Create(restserver.Config.CPUProfile)
if err != nil { if err != nil {
log.Fatal(err) return err
} }
if err := pprof.StartCPUProfile(f); err != nil { if err := pprof.StartCPUProfile(f); err != nil {
log.Fatal(err) return err
} }
log.Println("CPU profiling enabled") log.Println("CPU profiling enabled")
defer pprof.StopCPUProfile() defer pprof.StopCPUProfile()
@ -75,12 +75,8 @@ func runRoot(cmd *cobra.Command, args []string) error {
log.Printf("Starting server on %s\n", restserver.Config.Listen) log.Printf("Starting server on %s\n", restserver.Config.Listen)
err = http.ListenAndServeTLS(restserver.Config.Listen, publicKey, privateKey, handler) err = http.ListenAndServeTLS(restserver.Config.Listen, publicKey, privateKey, handler)
} }
if err != nil {
log.Fatal(err)
}
return nil
return err
} }
func main() { func main() {

2
mux.go
View file

@ -34,7 +34,7 @@ func debugHandler(next http.Handler) http.Handler {
func logHandler(next http.Handler) http.Handler { func logHandler(next http.Handler) http.Handler {
accessLog, err := os.OpenFile(Config.Log, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644) accessLog, err := os.OpenFile(Config.Log, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
if err != nil { if err != nil {
log.Fatal(err) log.Fatalf("error: %v", err)
} }
return handlers.CombinedLoggingHandler(accessLog, next) return handlers.CombinedLoggingHandler(accessLog, next)