projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10666: Formatting fixes.
[arvados.git]
/
services
/
keep-web
/
main.go
diff --git
a/services/keep-web/main.go
b/services/keep-web/main.go
index 8bd890322e2cae303c508304c33d852038a2557d..724af27c7e0e746b44218f5269d23b71228e6655 100644
(file)
--- a/
services/keep-web/main.go
+++ b/
services/keep-web/main.go
@@
-13,12
+13,12
@@
import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
"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"
"github.com/coreos/go-systemd/daemon"
)
var (
defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
"github.com/coreos/go-systemd/daemon"
)
var (
defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
+ version = "dev"
)
// Config specifies server configuration.
)
// Config specifies server configuration.
@@
-94,8
+94,8
@@
func main() {
// Print version information if requested
if *getVersion {
// 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 {
}
if err := config.LoadFile(cfg, configPath); err != nil {
@@
-115,7
+115,7
@@
func main() {
log.Fatal(config.DumpAndExit(cfg))
}
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}
os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost)
srv := &server{Config: cfg}