diff options
Diffstat (limited to 'src/hub/src/spreadspace.org/sfive/s5srvWeb.go')
| -rw-r--r-- | src/hub/src/spreadspace.org/sfive/s5srvWeb.go | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/hub/src/spreadspace.org/sfive/s5srvWeb.go b/src/hub/src/spreadspace.org/sfive/s5srvWeb.go index 64c73e4..9c9521a 100644 --- a/src/hub/src/spreadspace.org/sfive/s5srvWeb.go +++ b/src/hub/src/spreadspace.org/sfive/s5srvWeb.go @@ -224,12 +224,12 @@ func webUpdatesGetBulk(srv *Server, w http.ResponseWriter, r *http.Request) { enc, err := NewStatefulEncoder(w) if err != nil { - s5l.Printf("Error while sending init: %v", err) + s5l.Printf("server|web: sending response(init) failed: %v", err) return } for _, update := range updates { if err := enc.Encode(update); err != nil { - s5l.Printf("Error while sending data: %v", err) + s5l.Printf("server|web: sending response(data) failed: %v", err) return } } @@ -368,7 +368,7 @@ func sendWebResponse(w http.ResponseWriter, status int, respdata interface{}) { w.Header().Set("Content-Type", "application/json") w.WriteHeader(status) if err := json.NewEncoder(w).Encode(respdata); err != nil { - s5l.Printf("Error while sending data: %v", err) + s5l.Printf("server|web: sending response failed: %v", err) } } @@ -414,14 +414,15 @@ func webRun(listener *net.TCPListener, srv *Server) (err error) { return server.Serve(tcpKeepAliveListener{listener}) } -func (srv Server) ServeWeb(addr string) { - if addr == "" { - addr = ":http" - } - ln, err := net.Listen("tcp", addr) +func (srv Server) ServeWeb(cfg WebInterfaceConfig) { + ln, err := net.Listen("tcp", cfg.ListenAddr) if err != nil { - s5l.Printf("web: failed to listen: %v", err) + s5l.Printf("server|web: listen() failed: %v", err) return } + + s5l.Printf("server|web: listening on '%s'", cfg.ListenAddr) + defer s5l.Println("server|web: interface stopped") + webRun(ln.(*net.TCPListener), &srv) } |