Skip to content

Commit 25dcce5

Browse files
authored
wf Worker should only close clients it initialized (#748)
Signed-off-by: Tiago Scolari <[email protected]>
1 parent f4ba09f commit 25dcce5

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

workflow/worker.go

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,29 @@ func NewWorker(opts ...workerOption) (*WorkflowWorker, error) {
6464
return nil, errors.New("failed to load options")
6565
}
6666
}
67-
var daprClient dapr.Client
68-
var err error
69-
if options.daprClient == nil {
70-
daprClient, err = dapr.NewClient()
71-
} else {
67+
68+
var (
69+
daprClient dapr.Client
70+
err error
71+
closeFunc = func() {}
72+
)
73+
74+
if options.daprClient != nil {
7275
daprClient = options.daprClient
76+
} else {
77+
if daprClient, err = dapr.NewClient(); err != nil {
78+
return nil, err
79+
}
80+
81+
closeFunc = daprClient.Close
7382
}
74-
if err != nil {
75-
return nil, err
76-
}
83+
7784
grpcConn := daprClient.GrpcClientConn()
7885

7986
return &WorkflowWorker{
8087
tasks: task.NewTaskRegistry(),
8188
client: durabletaskclient.NewTaskHubGrpcClient(grpcConn, backend.DefaultLogger()),
82-
close: daprClient.Close,
89+
close: closeFunc,
8390
}, nil
8491
}
8592

0 commit comments

Comments
 (0)