10484: Track non-s3 errors by Go type.

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

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index 4a3b5627ddfb664a440e1dbad8a4b2defdd16a9f..5250d175ffa9995779c47d2fbaefedc992f09096 100644 (file)
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -81,7 +81,7 @@ func main() {
 
 var arvLogger *logger.Logger
 
-func singlerun(arv arvadosclient.ArvadosClient) error {
+func singlerun(arv *arvadosclient.ArvadosClient) error {
        var err error
        if isAdmin, err := util.UserIsAdmin(arv); err != nil {
                return errors.New("Error verifying admin token: " + err.Error())
@@ -142,7 +142,7 @@ func singlerun(arv arvadosclient.ArvadosClient) error {
                        rlbss.Count)
        }
 
-       kc, err := keepclient.MakeKeepClient(&arv)
+       kc, err := keepclient.MakeKeepClient(arv)
        if err != nil {
                return fmt.Errorf("Error setting up keep client %v", err.Error())
        }
@@ -185,7 +185,7 @@ func singlerun(arv arvadosclient.ArvadosClient) error {
 }
 
 // BuildDataFetcher returns a data fetcher that fetches data from remote servers.
-func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
+func BuildDataFetcher(arv *arvadosclient.ArvadosClient) summary.DataFetcher {
        return func(
                arvLogger *logger.Logger,
                readCollections *collection.ReadCollections,
@@ -209,7 +209,7 @@ func BuildDataFetcher(arv arvadosclient.ArvadosClient) summary.DataFetcher {
                                Logger: arvLogger,
                                Limit:  1000})
 
-               <- collDone
+               <-collDone
 
                // Return a nil error only if both parts succeeded.
                if collErr != nil {