Skip to content

Commit 029ebfb

Browse files
authored
chore: remove temporal address from constant (#246)
* chore: remove temporalAddr constant and make retry simple * chore: remove logs
1 parent a825e8c commit 029ebfb

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

server/internal/constants/constants.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ var (
2323
DefaultConfigDir = "/tmp/olake-config"
2424
DefaultLogRetentionPeriod = 30
2525
DefaultSpecVersion = "v0.2.0"
26-
DefaultTemporalAddress = "localhost:7233"
2726
// logging
2827
EnvLogLevel = "LOG_LEVEL"
2928
EnvLogFormat = "LOG_FORMAT"

server/internal/services/temporal/client.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ type Temporal struct {
2121

2222
// NewClient creates a new Temporal client
2323
func NewClient() (*Temporal, error) {
24-
temporalAddress := web.AppConfig.DefaultString(constants.ConfTemporalAddress, constants.DefaultTemporalAddress)
24+
temporalAddress, err := web.AppConfig.String(constants.ConfTemporalAddress)
25+
if err != nil {
26+
return nil, fmt.Errorf("failed to get temporal address: %s", err)
27+
}
2528

2629
var temporalClient *Temporal
27-
err := utils.RetryWithBackoff(func() error {
30+
err = utils.RetryWithBackoff(func() error {
2831
client, dialErr := client.Dial(client.Options{
2932
HostPort: temporalAddress,
3033
})

server/utils/utils.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,19 +295,22 @@ func ReadLogs(mainLogDir string) ([]map[string]interface{}, error) {
295295

296296
// RetryWithBackoff retries a function with exponential backoff
297297
func RetryWithBackoff(fn func() error, maxRetries int, initialDelay time.Duration) error {
298+
delay := initialDelay
298299
var errMsg error
299-
for i := 0; i < maxRetries; i++ {
300+
301+
for retry := 0; retry < maxRetries; retry++ {
300302
if err := fn(); err != nil {
301303
errMsg = err
302-
if i < maxRetries-1 {
303-
delay := initialDelay * time.Duration(1<<uint(i)) // exponential: 1s, 2s, 4s, 8s...
304-
logger.Warnf("Retry attempt %d/%d failed: %s. Retrying in %v...", i+1, maxRetries, err, delay)
304+
if retry < maxRetries-1 {
305+
logger.Warnf("Retry attempt %d/%d failed: %s. Retrying in %v...", retry+1, maxRetries, err, delay)
305306
time.Sleep(delay)
307+
delay *= 2
306308
continue
307309
}
308310
} else {
309311
return nil
310312
}
311313
}
314+
312315
return fmt.Errorf("failed after %d retries: %s", maxRetries, errMsg)
313316
}

0 commit comments

Comments
 (0)