diff options
author | feistel <6742251-feistel@users.noreply.gitlab.com> | 2021-04-28 04:40:27 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2021-04-28 04:40:27 +0300 |
commit | 75bcb4dc938e0e8ad4224d102b2ba8057fe34aaf (patch) | |
tree | 1a28728d43f89b6e0398240a2824848d661e4583 /main.go | |
parent | 8add308dfab8173282566ca053d8b3bb5219945c (diff) |
Handle and return errors in internal/config/
Diffstat (limited to 'main.go')
-rw-r--r-- | main.go | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -31,6 +31,8 @@ func initErrorReporting(sentryDSN, sentryEnvironment string) { errortracking.WithSentryEnvironment(sentryEnvironment)) } +// nolint: gocyclo +// TODO: reduce cyclomatic complexity https://gitlab.com/gitlab-org/gitlab-pages/-/issues/557 func appMain() { if err := validateargs.NotAllowed(os.Args[1:]); err != nil { log.WithError(err).Fatal("Using invalid arguments, use -config=gitlab-pages-config file instead") @@ -40,7 +42,10 @@ func appMain() { log.WithError(err).Warn("Using deprecated arguments") } - config := cfg.LoadConfig() + config, err := cfg.LoadConfig() + if err != nil { + log.WithError(err).Fatal("Failed to load config") + } printVersion(config.General.ShowVersion, VERSION) @@ -48,7 +53,7 @@ func appMain() { initErrorReporting(config.Sentry.DSN, config.Sentry.Environment) } - err := logging.ConfigureLogging(config.Log.Format, config.Log.Verbose) + err = logging.ConfigureLogging(config.Log.Format, config.Log.Verbose) if err != nil { log.WithError(err).Fatal("Failed to initialize logging") } |