Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Wiedler <iwiedler@gitlab.com>2020-04-27 19:01:09 +0300
committerIgor Wiedler <iwiedler@gitlab.com>2020-04-27 19:01:09 +0300
commitb0cb05d06af0febd485e0c15a3a71f610d91cb45 (patch)
tree051b3bc982a0050e54ebef9848abfb345d54c454
parent1ed3180b610563430d3a51db3659f45205687aab (diff)
app is in main package, no need to pass VERSION through
-rw-r--r--app.go2
-rw-r--r--app_config.go2
-rw-r--r--main.go2
3 files changed, 1 insertions, 5 deletions
diff --git a/app.go b/app.go
index c86d4c5e..e0d2e1fa 100644
--- a/app.go
+++ b/app.go
@@ -439,7 +439,7 @@ func (a *theApp) listenMetricsFD(wg *sync.WaitGroup, fd uintptr) {
}
monitoringOpts := []monitoring.Option{
- monitoring.WithBuildInformation(a.Version, ""),
+ monitoring.WithBuildInformation(VERSION, ""),
monitoring.WithListener(l),
}
diff --git a/app_config.go b/app_config.go
index a39067a6..245a9e0d 100644
--- a/app_config.go
+++ b/app_config.go
@@ -38,8 +38,6 @@ type appConfig struct {
SentryDSN string
SentryEnvironment string
CustomHeaders []string
-
- Version string
}
// GitlabServerURL returns URL to a GitLab instance.
diff --git a/main.go b/main.go
index 9b22fd0c..9a316c5e 100644
--- a/main.go
+++ b/main.go
@@ -239,8 +239,6 @@ func loadConfig() appConfig {
initErrorReporting(config.SentryDSN, config.SentryEnvironment)
}
- config.Version = VERSION
-
log.WithFields(log.Fields{
"artifacts-server": *artifactsServer,
"artifacts-server-timeout": *artifactsServerTimeout,