Skip to content

Commit 77bb694

Browse files
committed
generate executor ID in conductor mode if default is set + return an error if we fail to start conductor
1 parent a65a5c1 commit 77bb694

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

dbos/dbos.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"sync/atomic"
2121
"time"
2222

23+
"github.com/google/uuid"
2324
"github.com/robfig/cron/v3"
2425
)
2526

@@ -325,6 +326,10 @@ func NewDBOSContext(inputConfig Config) (DBOSContext, error) {
325326

326327
// Initialize conductor if API key is provided
327328
if config.ConductorAPIKey != "" {
329+
if initExecutor.executorID == "local" {
330+
initExecutor.executorID = uuid.NewString()
331+
}
332+
328333
if config.ConductorURL == "" {
329334
dbosDomain := os.Getenv("DBOS_DOMAIN")
330335
if dbosDomain == "" {
@@ -339,7 +344,7 @@ func NewDBOSContext(inputConfig Config) (DBOSContext, error) {
339344
}
340345
conductor, err := NewConductor(conductorConfig, initExecutor)
341346
if err != nil {
342-
initExecutor.logger.Warn("Failed to initialize conductor", "error", err)
347+
return nil, newInitializationError(fmt.Sprintf("failed to initialize conductor: %v", err))
343348
} else {
344349
initExecutor.conductor = conductor
345350
initExecutor.logger.Info("Conductor initialized")

0 commit comments

Comments
 (0)