X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3da10f0c0f5a0c0c91d49436a5995c890b03d228..af6d31cba8346ac86bc0027eb0f675144fb43056:/services/datamanager/datamanager.go

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index a9306ce83a..b81cf7edfe 100644
--- 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 {