homelab/traefik
1
0
Fork 0
Code Activity

Move version.go in its own package…

Browse source 
… making it possible to use in other packages ; and thus in the
User-Agent header for the docker client.

Also removing the dockerverion hack as it's not required anymore.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2016-07-21 16:33:49 +02:00
parent 4c54a003fa
commit 87a4d73556
No known key found for this signature in database
GPG key ID: 083CC6FD6EB699A3
6 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

26
traefik.go
View file

@ -3,14 +3,6 @@ package main
import (
"encoding/json"
"fmt"
log "github.com/Sirupsen/logrus"
"github.com/containous/flaeg"
"github.com/containous/staert"
"github.com/containous/traefik/acme"
"github.com/containous/traefik/middlewares"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/types"
"github.com/docker/libkv/store"
fmtlog "log"
"net/http"
"os"
@ -18,6 +10,16 @@ import (
"runtime"
"strings"
"text/template"
log "github.com/Sirupsen/logrus"
"github.com/containous/flaeg"
"github.com/containous/staert"
"github.com/containous/traefik/acme"
"github.com/containous/traefik/middlewares"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/types"
"github.com/containous/traefik/version"
"github.com/docker/libkv/store"
)
var versionTemplate = `Version: {{.Version}}
@ -65,10 +67,10 @@ Complete documentation is available at https://traefik.io`,
Os string
Arch string
}{
Version: Version,
Codename: Codename,
Version: version.Version,
Codename: version.Codename,
GoVersion: runtime.Version(),
BuildTime: BuildDate,
BuildTime: version.BuildDate,
Os: runtime.GOOS,
Arch: runtime.GOARCH,
}
@ -184,7 +186,7 @@ func run(traefikConfiguration *TraefikConfiguration) {
log.SetFormatter(&log.TextFormatter{FullTimestamp: true, DisableSorting: true})
}
jsonConf, _ := json.Marshal(globalConfiguration)
log.Infof("Traefik version %s built on %s", Version, BuildDate)
log.Infof("Traefik version %s built on %s", version.Version, version.BuildDate)
if len(traefikConfiguration.ConfigFile) != 0 {
log.Infof("Using TOML configuration file %s", traefikConfiguration.ConfigFile)
}