httplib: add Close() method to shut the server down and use it in tests

cmd/serve/httplib/http_new.go

@@ -14,3 +14,8 @@ func initServer(s *http.Server) {
 	s.ReadHeaderTimeout = 10 * time.Second // time to send the headers
 	s.IdleTimeout = 60 * time.Second       // time to keep idle connections open
 }
+
+// closeServer closes the server in a non graceful way
+func closeServer(s *http.Server) error {
+	return s.Close()
+}

cmd/serve/httplib/http_old.go

@@ -11,3 +11,8 @@ import (
 // Initialise the http.Server for pre go1.8
 func initServer(s *http.Server) {
 }
+
+// closeServer closes the server in a non graceful way
+func closeServer(s *http.Server) error {
+	return nil
+}

cmd/serve/httplib/httplib.go

@@ -183,7 +183,15 @@ func (s *Server) Serve() {
 	} else {
 		err = s.httpServer.ListenAndServe()
 	}
-	log.Fatalf("Fatal error while serving HTTP: %v", err)
+	log.Printf("Error while serving HTTP: %v", err)
+}
+
+// Close shuts the running server down
+func (s *Server) Close() {
+	err := closeServer(s.httpServer)
+	if err != nil {
+		log.Printf("Error on closing HTTP server: %v", err)
+	}
 }
 
 // URL returns the serving address of this server