From 7775d2af0e18d822c4e02c6ae53ee1dea0feb5de Mon Sep 17 00:00:00 2001 From: James Elliott Date: Thu, 3 Feb 2022 14:04:24 +1100 Subject: [PATCH] fix(ntp): disable failure ignored (#2835) Disable failure was ignored previously, this ensures it isn't. --- docs/contributing/commitmsg-guidelines.md | 1 + internal/commands/root.go | 4 +++- web/.commitlintrc.js | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/contributing/commitmsg-guidelines.md b/docs/contributing/commitmsg-guidelines.md index 3aa78a4c8..04713d54f 100644 --- a/docs/contributing/commitmsg-guidelines.md +++ b/docs/contributing/commitmsg-guidelines.md @@ -79,6 +79,7 @@ The scope should be the name of the package affected * mocks * models * notification +* ntp * oidc * regulation * server diff --git a/internal/commands/root.go b/internal/commands/root.go index a347428ad..dd11bfed9 100644 --- a/internal/commands/root.go +++ b/internal/commands/root.go @@ -110,7 +110,9 @@ func doStartupChecks(config *schema.Configuration, providers *middlewares.Provid } else if err = doStartupCheck(logger, "ntp", providers.NTP, config.NTP.DisableStartupCheck); err != nil { logger.Errorf("Failure running the user provider startup check: %+v", err) - failures = append(failures, "ntp") + if !config.NTP.DisableFailure { + failures = append(failures, "ntp") + } } if len(failures) != 0 { diff --git a/web/.commitlintrc.js b/web/.commitlintrc.js index 16eedc311..ee54e828b 100644 --- a/web/.commitlintrc.js +++ b/web/.commitlintrc.js @@ -36,6 +36,7 @@ module.exports = { "models", "notification", "npm", + "ntp", "oidc", "regulation", "renovate",