X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b4866c16547c6c3196d5d8327686986e8997c187..67f730557e062608f842fa3abc612fb717fbce2f:/services/datamanager/datamanager.go

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index 3fb135cb3a..a9306ce83a 100644
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -44,7 +44,7 @@ func main() {
 	if minutesBetweenRuns == 0 {
 		err := singlerun(makeArvadosClient())
 		if err != nil {
-			log.Fatalf("Got an error: %v", err)
+			log.Fatalf("singlerun: %v", err)
 		}
 	} else {
 		waitTime := time.Minute * time.Duration(minutesBetweenRuns)
@@ -52,7 +52,7 @@ func main() {
 			log.Println("Beginning Run")
 			err := singlerun(makeArvadosClient())
 			if err != nil {
-				log.Printf("Got an error: %v", err)
+				log.Printf("singlerun: %v", err)
 			}
 			log.Printf("Sleeping for %d minutes", minutesBetweenRuns)
 			time.Sleep(waitTime)
@@ -70,12 +70,10 @@ func makeArvadosClient() arvadosclient.ArvadosClient {
 
 func singlerun(arv arvadosclient.ArvadosClient) error {
 	var err error
-	if is_admin, err := util.UserIsAdmin(arv); err != nil {
-		log.Printf("Error querying current arvados user %s", err.Error())
-		return err
-	} else if !is_admin {
-		log.Printf("Current user is not an admin. Datamanager can only be run by admins.")
-		return errors.New("Current user is not an admin. Datamanager can only be run by admins.")
+	if isAdmin, err := util.UserIsAdmin(arv); err != nil {
+		return errors.New("Error verifying admin token: " + err.Error())
+	} else if !isAdmin {
+		return errors.New("Current user is not an admin. Datamanager requires a privileged token.")
 	}
 
 	var arvLogger *logger.Logger
@@ -160,14 +158,13 @@ func singlerun(arv arvadosclient.ArvadosClient) error {
 
 	if trashErr != nil {
 		return err
-	} else {
-		keep.SendTrashLists(kc, trashLists)
 	}
+	keep.SendTrashLists(kc, trashLists)
 
 	return nil
 }
 
-// Returns a data fetcher that fetches data from remote servers.
+// BuildDataFetcher returns a data fetcher that fetches data from remote servers.
 func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
 	return func(arvLogger *logger.Logger,
 		readCollections *collection.ReadCollections,