projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 9998-unsigned_manifest
[arvados.git]
/
services
/
ws
/
main.go
diff --git
a/services/ws/main.go
b/services/ws/main.go
index 77ebf9ee4a8aed2e6b85454f0a3a77570df11bab..7c3625bdad2df51ee652122b807d4dafeb892349 100644
(file)
--- a/
services/ws/main.go
+++ b/
services/ws/main.go
@@
-7,9
+7,12
@@
import (
"time"
"git.curoverse.com/arvados.git/sdk/go/config"
"time"
"git.curoverse.com/arvados.git/sdk/go/config"
+ "git.curoverse.com/arvados.git/sdk/go/ctxlog"
"github.com/coreos/go-systemd/daemon"
)
"github.com/coreos/go-systemd/daemon"
)
+var logger = ctxlog.FromContext
+
func main() {
log := logger(nil)
func main() {
log := logger(nil)
@@
-23,7
+26,8
@@
func main() {
log.Fatal(err)
}
log.Fatal(err)
}
- loggerConfig(cfg)
+ ctxlog.SetLevel(cfg.LogLevel)
+ ctxlog.SetFormat(cfg.LogFormat)
if *dumpConfig {
txt, err := config.Dump(&cfg)
if *dumpConfig {
txt, err := config.Dump(&cfg)