RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logging fixes

Browse Source
This commit is contained in:
Martin Boehm 2018-01-18 20:32:10 +01:00
parent 4e4c17a41a
commit 5ae73b9bb7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
blockbook.go
View File

@ -146,17 +146,17 @@ func waitForSignalAndShutdown(s *server.HttpServer, timeout time.Duration) {
signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM) signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM)
<-stop sig := <-stop
ctx, cancel := context.WithTimeout(context.Background(), timeout) ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel() defer cancel()
log.Printf("\nShutdown with timeout: %s\n", timeout) log.Printf("Shutdown %v", sig)
if err := s.Shutdown(ctx); err != nil { if s != nil {
log.Printf("Error: %v\n", err) if err := s.Shutdown(ctx); err != nil {
} else { log.Printf("Error: %v", err)
log.Println("Server stopped") }
} }
} }

8
server/https.go
View File

@ -4,7 +4,7 @@ import (
"blockbook/db" "blockbook/db"
"context" "context"
"encoding/json" "encoding/json"
"fmt" "log"
"net/http" "net/http"
"os" "os"
@ -38,17 +38,17 @@ func New(db *db.RocksDB) (*HttpServer, error) {
} }
func (s *HttpServer) Run() error { func (s *HttpServer) Run() error {
fmt.Printf("http server starting on port %s", s.https.Addr) log.Printf("http server starting on port %s", s.https.Addr)
return s.https.ListenAndServe() return s.https.ListenAndServe()
} }
func (s *HttpServer) Close() error { func (s *HttpServer) Close() error {
fmt.Printf("http server closing") log.Printf("http server closing")
return s.https.Close() return s.https.Close()
} }
func (s *HttpServer) Shutdown(ctx context.Context) error { func (s *HttpServer) Shutdown(ctx context.Context) error {
fmt.Printf("http server shutdown") log.Printf("http server shutdown")
return s.https.Shutdown(ctx) return s.https.Shutdown(ctx)
} }