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)
}
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)
}
}
}
-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 {
arvadostest.StartAPI()
arvadostest.StartKeep(2, false)
- arv = makeArvadosClient()
+ var err error
+ arv, err = makeArvadosClient()
+ if err != nil {
+ t.Fatalf("Error making arvados client: %s", err)
+ }
arv.ApiToken = arvadostest.DataManagerToken
// keep client
}
// discover keep services
- if err := keepClient.DiscoverKeepServers(); err != nil {
+ if err = keepClient.DiscoverKeepServers(); err != nil {
t.Fatalf("Error discovering keep services: %s", err)
}
keepServers = []string{}