Merge branch 'fix/errortracking' into 'master'

fix: handle errortracking init error

See merge request gitlab-org/gitlab-pages!566

1 files changed, 6 insertions, 3 deletions

diff --git a/main.go b/main.go
index 042e5974..f2f1d69b 100644
--- a/main.go
+++ b/main.go
@@ -24,8 +24,8 @@ var VERSION = "dev"
 // REVISION stores the information about the git revision of application
 var REVISION = "HEAD"
 
-func initErrorReporting(sentryDSN, sentryEnvironment string) {
-	errortracking.Initialize(
+func initErrorReporting(sentryDSN, sentryEnvironment string) error {
+	return errortracking.Initialize(
 		errortracking.WithSentryDSN(sentryDSN),
 		errortracking.WithVersion(fmt.Sprintf("%s-%s", VERSION, REVISION)),
 		errortracking.WithLoggerName("gitlab-pages"),
@@ -55,7 +55,10 @@ func appMain() {
 	}
 
 	if config.Sentry.DSN != "" {
-		initErrorReporting(config.Sentry.DSN, config.Sentry.Environment)
+		err := initErrorReporting(config.Sentry.DSN, config.Sentry.Environment)
+		if err != nil {
+			log.WithError(err).Warn("Failed to initialize errortracking")
+		}
 	}
 
 	err = logging.ConfigureLogging(config.Log.Format, config.Log.Verbose)