Merge branch 'master' into 7490-datamanager-dont-die-return-error

[arvados.git] / services / datamanager / datamanager.go

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index a9306ce83a6011002cef96b86eb6caf700feda23..b81cf7edfeeb8ae00f16b0d39b1a7b54867e57b3 100644 (file)
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -42,7 +42,11 @@ func init() {
 func main() {
        flag.Parse()
        if minutesBetweenRuns == 0 {
-               err := singlerun(makeArvadosClient())
+               arv, err := makeArvadosClient()
+               if err != nil {
+                       log.Fatalf("makeArvadosClient: %v", err)
+               }
+               err = singlerun(arv)
                if err != nil {
                        log.Fatalf("singlerun: %v", err)
                }
@@ -50,7 +54,11 @@ func main() {
                waitTime := time.Minute * time.Duration(minutesBetweenRuns)
                for {
                        log.Println("Beginning Run")
-                       err := singlerun(makeArvadosClient())
+                       arv, err := makeArvadosClient()
+                       if err != nil {
+                               log.Fatalf("makeArvadosClient: %v", err)
+                       }
+                       err = singlerun(arv)
                        if err != nil {
                                log.Printf("singlerun: %v", err)
                        }
@@ -60,12 +68,8 @@ func main() {
        }
 }
 
-func makeArvadosClient() arvadosclient.ArvadosClient {
-       arv, err := arvadosclient.MakeArvadosClient()
-       if err != nil {
-               log.Fatalf("Error setting up arvados client: %s", err)
-       }
-       return arv
+func makeArvadosClient() (arvadosclient.ArvadosClient, error) {
+       return arvadosclient.MakeArvadosClient()
 }
 
 func singlerun(arv arvadosclient.ArvadosClient) error {