Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/loop/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/services"
"github.com/smartcontractkit/chainlink-common/pkg/services/otelhealth"
"github.com/smartcontractkit/chainlink-common/pkg/services/promhealth"
"github.com/smartcontractkit/chainlink-common/pkg/settings/cresettings"
"github.com/smartcontractkit/chainlink-common/pkg/settings/limits"
"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
"github.com/smartcontractkit/chainlink-common/pkg/sqlutil/pg"
Expand Down Expand Up @@ -223,6 +224,7 @@ func (s *Server) start() error {
s.LimitsFactory.Logger = s.Logger.Named("LimitsFactory")
if bc := beholder.GetClient(); bc != nil {
s.LimitsFactory.Meter = bc.Meter
s.LimitsFactory.Settings = cresettings.DefaultGetter
}

return nil
Expand Down
15 changes: 14 additions & 1 deletion pkg/settings/cresettings/settings.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// Package cresettings contains configurable settings definitions for nodes in the CRE.
// Environment Variables:
// - CL_CRE_SETTINGS_DEFAULT: defaults like in ./defaults.json - initializes Default
// - CL_CRE_SETTINGS: scoped settings like in ../settings/testdata/config.json - initializes DefaultGetter
package cresettings

import (
Expand All @@ -14,7 +17,7 @@ import (
)

func init() {
if v, ok := os.LookupEnv("CL_CRE_SETTINGS"); ok {
if v, ok := os.LookupEnv("CL_CRE_SETTINGS_DEFAULT"); ok {
err := json.Unmarshal([]byte(v), &Default)
if err != nil {
log.Fatalf("failed to initialize defaults: %v", err)
Expand All @@ -25,8 +28,18 @@ func init() {
log.Fatalf("failed to initialize keys: %v", err)
}
Config = Default

if v, ok := os.LookupEnv("CL_CRE_SETTINGS"); ok {
DefaultGetter, err = NewJSONGetter([]byte(v))
if err != nil {
log.Fatalf("failed to initialize settings: %v", err)
}
}
}

// DefaultGetter is a default settings getter populated from the env var CL_CRE_SETTINGS if set, otherwise it is nil.
var DefaultGetter Getter

// Deprecated: use Default
var Config Schema

Expand Down
Loading