Merge branch '10998-keepweb-block-cache-size'

[arvados.git] / lib / dispatchcloud / cmd.go

diff --git a/lib/dispatchcloud/cmd.go b/lib/dispatchcloud/cmd.go
index 82205c74262458d39ac4c25c9a6327815a34c332..ae6ac70e9665f777069232d49eaf0dd76a66d1a2 100644 (file)
--- a/lib/dispatchcloud/cmd.go
+++ b/lib/dispatchcloud/cmd.go
@@ -6,6 +6,7 @@ package dispatchcloud
 
 import (
        "context"
+       "fmt"
 
        "git.curoverse.com/arvados.git/lib/cmd"
        "git.curoverse.com/arvados.git/lib/service"
@@ -14,11 +15,16 @@ import (
 
 var Command cmd.Handler = service.Command(arvados.ServiceNameDispatchCloud, newHandler)
 
-func newHandler(ctx context.Context, cluster *arvados.Cluster, _ *arvados.NodeProfile) service.Handler {
+func newHandler(ctx context.Context, cluster *arvados.Cluster, token string) service.Handler {
+       ac, err := arvados.NewClientFromConfig(cluster)
+       if err != nil {
+               return service.ErrorHandler(ctx, cluster, fmt.Errorf("error initializing client from cluster config: %s", err))
+       }
        d := &dispatcher{
                Cluster:   cluster,
                Context:   ctx,
-               AuthToken: service.Token(ctx),
+               ArvClient: ac,
+               AuthToken: token,
        }
        go d.Start()
        return d