diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2022-04-27 16:21:11 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2022-04-27 16:21:11 +0300 |
| commit | b6a9f8e5ff171c5333fee2adc9815b356aab33e2 (patch) | |
| tree | 92c7f3679146e57694960e63e24cd25159c358b6 | |
| parent | 38a9a40bca0007be1cb80b6ccb4cb3573b63d79e (diff) | |
| parent | de280760e40d45a05c1c7ccd99d7465ca1fba26e (diff) | |
Merge branch 'remove-daemon-flags' into 'master'
Remove deprecated daemon flags.
See merge request gitlab-org/gitlab-pages!751
| -rw-r--r-- | internal/config/flags.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/internal/config/flags.go b/internal/config/flags.go index 75d01957..1ab78053 100644 --- a/internal/config/flags.go +++ b/internal/config/flags.go @@ -42,10 +42,6 @@ var ( metricsAddress = flag.String("metrics-address", "", "The address to listen on for metrics requests") sentryDSN = flag.String("sentry-dsn", "", "The address for sending sentry crash reporting to") sentryEnvironment = flag.String("sentry-environment", "", "The environment for sentry crash reporting") - _ = flag.Uint("daemon-uid", 0, "DEPRECATED and ignored, will be removed in 15.0") - _ = flag.Uint("daemon-gid", 0, "DEPRECATED and ignored, will be removed in 15.0") - _ = flag.Bool("daemon-enable-jail", false, "DEPRECATED and ignored, will be removed in 15.0") - _ = flag.Bool("daemon-inplace-chroot", false, "DEPRECATED and ignored, will be removed in 15.0") // TODO: https://gitlab.com/gitlab-org/gitlab-pages/-/issues/599 propagateCorrelationID = flag.Bool("propagate-correlation-id", false, "Reuse existing Correlation-ID from the incoming request header `X-Request-ID` if present") serverShutdownTimeout = flag.Duration("server-shutdown-timeout", 30*time.Second, "GitLab Pages server shutdown timeout (default: 30s)") logFormat = flag.String("log-format", "json", "The log output format: 'text' or 'json'") |