diff options
author | Jaime Martinez <jmartinez@gitlab.com> | 2020-11-19 03:43:10 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2020-11-30 02:15:10 +0300 |
commit | 22ede0d8ea69bf26929825a75dad4172ef25cc26 (patch) | |
tree | d14744a948992913c09827a6914fb770a86eed92 /main.go | |
parent | a7db22b91f700f5f8ed17fd141a21b763c2af87e (diff) |
Move zip flags to config
Diffstat (limited to 'main.go')
-rw-r--r-- | main.go | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -16,7 +16,6 @@ import ( "gitlab.com/gitlab-org/labkit/errortracking" - cfg "gitlab.com/gitlab-org/gitlab-pages/internal/config" "gitlab.com/gitlab-org/gitlab-pages/internal/logging" "gitlab.com/gitlab-org/gitlab-pages/internal/request" "gitlab.com/gitlab-org/gitlab-pages/internal/tlsconfig" @@ -80,12 +79,6 @@ var ( disableCrossOriginRequests = flag.Bool("disable-cross-origin-requests", false, "Disable cross-origin requests") - // zip serving settings - zipCacheExpiration = flag.Duration("zip-cache-expiration", 60*time.Second, "Zip serving archive cache expiration interval (default: 60s)") - zipCacheCleanup = flag.Duration("zip-cache-cleanup", 30*time.Second, "Zip serving archive cache cleanup interval (default: 30s)") - zipCacheRefresh = flag.Duration("zip-cache-refresh", 30*time.Second, "Zip serving archive cache refresh interval (default: 30s)") - zipOpenTimeout = flag.Duration("zip-open-timeout", 30*time.Second, "Zip archive open timeout (default: 30s)") - // See init() listenHTTP MultiStringFlag listenHTTPS MultiStringFlag @@ -220,13 +213,6 @@ func configFromFlags() appConfig { checkAuthenticationConfig(config) - cfg.DefaultConfig.SetZip(&cfg.ZipServing{ - ExpirationInterval: *zipCacheExpiration, - CleanupInterval: *zipCacheCleanup, - RefreshInterval: *zipCacheRefresh, - OpenTimeout: *zipOpenTimeout, - }) - return config } |