diff --git a/server/internal/constants/constants.go b/server/internal/constants/constants.go index 8eb0d0eb..99f557fe 100644 --- a/server/internal/constants/constants.go +++ b/server/internal/constants/constants.go @@ -23,7 +23,6 @@ var ( DefaultConfigDir = "/tmp/olake-config" DefaultLogRetentionPeriod = 30 DefaultSpecVersion = "v0.2.0" - DefaultTemporalAddress = "localhost:7233" // logging EnvLogLevel = "LOG_LEVEL" EnvLogFormat = "LOG_FORMAT" diff --git a/server/internal/services/temporal/client.go b/server/internal/services/temporal/client.go index ffead967..1d41de9f 100644 --- a/server/internal/services/temporal/client.go +++ b/server/internal/services/temporal/client.go @@ -21,10 +21,13 @@ type Temporal struct { // NewClient creates a new Temporal client func NewClient() (*Temporal, error) { - temporalAddress := web.AppConfig.DefaultString(constants.ConfTemporalAddress, constants.DefaultTemporalAddress) + temporalAddress, err := web.AppConfig.String(constants.ConfTemporalAddress) + if err != nil { + return nil, fmt.Errorf("failed to get temporal address: %s", err) + } var temporalClient *Temporal - err := utils.RetryWithBackoff(func() error { + err = utils.RetryWithBackoff(func() error { client, dialErr := client.Dial(client.Options{ HostPort: temporalAddress, }) diff --git a/server/utils/utils.go b/server/utils/utils.go index 8cb0e3a9..5cf66610 100644 --- a/server/utils/utils.go +++ b/server/utils/utils.go @@ -295,19 +295,22 @@ func ReadLogs(mainLogDir string) ([]map[string]interface{}, error) { // RetryWithBackoff retries a function with exponential backoff func RetryWithBackoff(fn func() error, maxRetries int, initialDelay time.Duration) error { + delay := initialDelay var errMsg error - for i := 0; i < maxRetries; i++ { + + for retry := 0; retry < maxRetries; retry++ { if err := fn(); err != nil { errMsg = err - if i < maxRetries-1 { - delay := initialDelay * time.Duration(1<