From 75bcb4dc938e0e8ad4224d102b2ba8057fe34aaf Mon Sep 17 00:00:00 2001
From: feistel <6742251-feistel@users.noreply.gitlab.com>
Date: Wed, 28 Apr 2021 01:40:27 +0000
Subject: Handle and return errors in internal/config/

---
 main.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index 441b3a74..ec4f917f 100644
--- a/main.go
+++ b/main.go
@@ -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")
 	}
-- 
cgit v1.2.3