import (
"flag"
"fmt"
- "log"
"os"
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
- arvadosVersion "git.curoverse.com/arvados.git/sdk/go/version"
+ log "github.com/Sirupsen/logrus"
"github.com/coreos/go-systemd/daemon"
)
var (
defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
+ version = "dev"
)
// Config specifies server configuration.
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() {
// Print version information if requested
if *getVersion {
- fmt.Printf("Version: %s\n", arvadosVersion.GetVersion())
- os.Exit(0)
+ fmt.Printf("keep-web %s\n", version)
+ return
}
if err := config.LoadFile(cfg, configPath); err != nil {
log.Fatal(config.DumpAndExit(cfg))
}
- log.Printf("keep-web %q started", arvadosVersion.GetVersion())
+ log.Printf("keep-web %s started", version)
os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost)
srv := &server{Config: cfg}