projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15003: Merge branch 'master'
[arvados.git]
/
services
/
arv-git-httpd
/
main.go
diff --git
a/services/arv-git-httpd/main.go
b/services/arv-git-httpd/main.go
index 2750ab9eaf0ab51b8517deba914f8726592ce674..74ac7ae55eea05aa396f9ff337a8dbed74505079 100644
(file)
--- a/
services/arv-git-httpd/main.go
+++ b/
services/arv-git-httpd/main.go
@@
-14,10
+14,11
@@
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"
)
"github.com/coreos/go-systemd/daemon"
)
+var version = "dev"
+
// Server configuration
type Config struct {
Client arvados.Client
// Server configuration
type Config struct {
Client arvados.Client
@@
-62,8
+63,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("
arv-git-httpd %s\n", version
)
+ return
}
err := config.LoadFile(theConfig, *cfgPath)
}
err := config.LoadFile(theConfig, *cfgPath)
@@
-93,7
+94,7
@@
func main() {
if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
log.Printf("Error notifying init daemon: %v", err)
}
if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
log.Printf("Error notifying init daemon: %v", err)
}
- log.Printf("arv-git-httpd %
q started", arvadosVersion.GetVersion()
)
+ log.Printf("arv-git-httpd %
s started", version
)
log.Println("Listening at", srv.Addr)
log.Println("Repository root", theConfig.RepoRoot)
if err := srv.Wait(); err != nil {
log.Println("Listening at", srv.Addr)
log.Println("Repository root", theConfig.RepoRoot)
if err := srv.Wait(); err != nil {