diff --git a/.changeset/fix-audit-logger-startup.md b/.changeset/fix-audit-logger-startup.md new file mode 100644 index 00000000000..0dfd55e7d43 --- /dev/null +++ b/.changeset/fix-audit-logger-startup.md @@ -0,0 +1,5 @@ +--- +"chainlink": patch +--- + +#bugfix #nops Fix node startup when the audit logger is enabled by assigning the service a health-check name. diff --git a/core/logger/audit/audit_logger.go b/core/logger/audit/audit_logger.go index 6e9e25202dd..c8eae991a91 100644 --- a/core/logger/audit/audit_logger.go +++ b/core/logger/audit/audit_logger.go @@ -21,6 +21,7 @@ import ( ) const ( + auditLoggerName = "AuditLogger" bufferCapacity = 2048 webRequestTimeout = 10 ) @@ -91,7 +92,7 @@ func NewAuditLogger(logger logger.Logger, config config.AuditLogger) (AuditLogge // Create new AuditLoggerService auditLogger := AuditLoggerService{ - logger: logger.Helper(1), + logger: logger.Named(auditLoggerName).Helper(1), enabled: true, forwardToUrl: forwardToUrl, headers: headers, diff --git a/core/logger/audit/audit_logger_test.go b/core/logger/audit/audit_logger_test.go index 34a92074bd8..fd67cc28f4c 100644 --- a/core/logger/audit/audit_logger_test.go +++ b/core/logger/audit/audit_logger_test.go @@ -13,6 +13,7 @@ import ( "github.com/urfave/cli" commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config" + commonservices "github.com/smartcontractkit/chainlink-common/pkg/services" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/logger/audit" @@ -81,6 +82,17 @@ func (c Config) JsonWrapperKey() string { return "" } +func TestAuditLoggerRegistersForHealthChecks(t *testing.T) { + t.Parallel() + + auditLogger, err := audit.NewAuditLogger(logger.TestLogger(t), Config{}) + require.NoError(t, err) + require.Equal(t, "AuditLogger", auditLogger.Name()) + + healthChecker := commonservices.HealthCheckerConfig{}.New() + require.NoError(t, healthChecker.Register(auditLogger)) +} + func TestCheckLoginAuditLog(t *testing.T) { t.Parallel() @@ -99,7 +111,7 @@ func TestCheckLoginAuditLog(t *testing.T) { auditLoggerTestConfig := Config{} // Create new AuditLoggerService - auditLogger, err := audit.NewAuditLogger(logger.Named("AuditLogger"), &auditLoggerTestConfig) + auditLogger, err := audit.NewAuditLogger(logger, &auditLoggerTestConfig) assert.NoError(t, err) // Cast to concrete type so we can swap out the internals