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:
authorJaime Martinez <jmartinez@gitlab.com>2020-01-21 06:07:40 +0300
committerJaime Martinez <jmartinez@gitlab.com>2020-01-21 06:07:40 +0300
commitbd2bc7583679c19c9f1a9115016c609d0ffbbc2b (patch)
tree25b78fc262b555a2431445626274ec0dc7ec4a5d /app_config.go
parent101dad88e4a4c2c7e086efedcb51267199550328 (diff)
use flag.Duration for the new configs instead of int64
Diffstat (limited to 'app_config.go')
-rw-r--r--app_config.go26
1 files changed, 13 insertions, 13 deletions
diff --git a/app_config.go b/app_config.go
index 4bca27aa..245a9e0d 100644
--- a/app_config.go
+++ b/app_config.go
@@ -27,17 +27,17 @@ type appConfig struct {
LogFormat string
LogVerbose bool
- StoreSecret string
- GitLabServer string
- GitLabAPISecretKey []byte
- GitlabClientTimeout int64
- GitlbaJWTTokenExpiry int64
- ClientID string
- ClientSecret string
- RedirectURI string
- SentryDSN string
- SentryEnvironment string
- CustomHeaders []string
+ StoreSecret string
+ GitLabServer string
+ GitLabAPISecretKey []byte
+ GitlabClientHTTPTimeout time.Duration
+ GitlabJWTTokenExpiration time.Duration
+ ClientID string
+ ClientSecret string
+ RedirectURI string
+ SentryDSN string
+ SentryEnvironment string
+ CustomHeaders []string
}
// GitlabServerURL returns URL to a GitLab instance.
@@ -51,9 +51,9 @@ func (config appConfig) GitlabAPISecret() []byte {
}
func (config appConfig) GitlabClientConnectionTimeout() time.Duration {
- return time.Duration(config.GitlabClientTimeout) * time.Second
+ return config.GitlabClientHTTPTimeout
}
func (config appConfig) GitlabJWTTokenExpiry() time.Duration {
- return time.Duration(config.GitlbaJWTTokenExpiry) * time.Second
+ return config.GitlabJWTTokenExpiration
}