projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12626: Merge branch 'master' into 12626-merge-accounts
[arvados.git]
/
services
/
keep-web
/
main.go
diff --git
a/services/keep-web/main.go
b/services/keep-web/main.go
index 724af27c7e0e746b44218f5269d23b71228e6655..d09fce706c4a50033649b32df152afa30ab85dc6 100644
(file)
--- a/
services/keep-web/main.go
+++ b/
services/keep-web/main.go
@@
-7,12
+7,12
@@
package main
import (
"flag"
"fmt"
import (
"flag"
"fmt"
- "log"
"os"
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
"os"
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
+ log "github.com/Sirupsen/logrus"
"github.com/coreos/go-systemd/daemon"
)
"github.com/coreos/go-systemd/daemon"
)
@@
-65,6
+65,10
@@
func init() {
if os.Getenv("ARVADOS_API_TOKEN") == "" {
os.Setenv("ARVADOS_API_TOKEN", "xxx")
}
if os.Getenv("ARVADOS_API_TOKEN") == "" {
os.Setenv("ARVADOS_API_TOKEN", "xxx")
}
+
+ log.SetFormatter(&log.JSONFormatter{
+ TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
+ })
}
func main() {
}
func main() {