projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9912-config-yaml' closes #9912
[arvados.git]
/
services
/
keep-web
/
server.go
diff --git
a/services/keep-web/server.go
b/services/keep-web/server.go
index 100900830f5d6808563a928fdd3e501ca660d501..babc68b6b59d37a14f17ac26f8cc49dc1485b4ca 100644
(file)
--- a/
services/keep-web/server.go
+++ b/
services/keep-web/server.go
@@
-1,27
+1,16
@@
package main
import (
package main
import (
- "flag"
- "net/http"
-
"git.curoverse.com/arvados.git/sdk/go/httpserver"
)
"git.curoverse.com/arvados.git/sdk/go/httpserver"
)
-var address string
-
-func init() {
- flag.StringVar(&address, "listen", ":80",
- "Address to listen on: \"host:port\", or \":port\" to listen on all interfaces.")
-}
-
type server struct {
httpserver.Server
type server struct {
httpserver.Server
+ Config *Config
}
func (srv *server) Start() error {
}
func (srv *server) Start() error {
- mux := http.NewServeMux()
- mux.Handle("/", &handler{})
- srv.Handler = mux
- srv.Addr = address
+ srv.Handler = &handler{Config: srv.Config}
+ srv.Addr = srv.Config.Listen
return srv.Server.Start()
}
return srv.Server.Start()
}