Reset listener=nil before running main() from test cases, so

[arvados.git] / services / keepproxy / keepproxy.go

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 503642d92d4a09cff94af4c7f09761729ddca7d1..888db7357d47bc8035301501b8d201a3dc8c4c36 100644 (file)
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -105,7 +105,6 @@ func main() {
                s := <-sig
                log.Println("caught signal:", s)
                listener.Close()
-               listener = nil
        }(term)
        signal.Notify(term, syscall.SIGTERM)
        signal.Notify(term, syscall.SIGINT)
@@ -248,6 +247,7 @@ func MakeRESTRouter(
                rest.Handle(`/{hash:[0-9a-f]{32}}+{hints}`, PutBlockHandler{kc, t}).Methods("PUT")
                rest.Handle(`/{hash:[0-9a-f]{32}}`, PutBlockHandler{kc, t}).Methods("PUT")
                rest.Handle(`/`, PutBlockHandler{kc, t}).Methods("POST")
+               rest.Handle(`/{any}`, OptionsHandler{}).Methods("OPTIONS")
                rest.Handle(`/`, OptionsHandler{}).Methods("OPTIONS")
        }