import (
"flag"
"fmt"
- "log"
- "net/http"
- "time"
"git.curoverse.com/arvados.git/sdk/go/config"
+ "git.curoverse.com/arvados.git/sdk/go/ctxlog"
)
-var debugLogf = func(string, ...interface{}) {}
+var logger = ctxlog.FromContext
func main() {
+ log := logger(nil)
+
configPath := flag.String("config", "/etc/arvados/ws/ws.yml", "`path` to config file")
dumpConfig := flag.Bool("dump-config", false, "show current configuration and exit")
- cfg := DefaultConfig()
+ cfg := defaultConfig()
flag.Parse()
err := config.LoadFile(&cfg, *configPath)
if err != nil {
log.Fatal(err)
}
- if cfg.Debug {
- debugLogf = log.Printf
- }
+
+ ctxlog.SetLevel(cfg.LogLevel)
+ ctxlog.SetFormat(cfg.LogFormat)
if *dumpConfig {
txt, err := config.Dump(&cfg)
return
}
- srv := &http.Server{
- Addr: cfg.Listen,
- ReadTimeout: time.Minute,
- WriteTimeout: time.Minute,
- MaxHeaderBytes: 1 << 20,
- Handler: &router{
- Config: &cfg,
- eventSource: &pgEventSource{
- PgConfig: cfg.Postgres,
- QueueSize: cfg.ServerEventQueue,
- },
- },
- }
- log.Fatal(srv.ListenAndServe())
+ log.Info("started")
+ srv := &server{wsConfig: &cfg}
+ log.Fatal(srv.Run())
}