X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c4023fb9b27ba31926faf530a4e59b9aee0989b3..a2d956a99bb08ff983b667c8af7d528aa0e8d5ba:/services/datamanager/summary/file.go?ds=sidebyside

diff --git a/services/datamanager/summary/file.go b/services/datamanager/summary/file.go
index 63c8adeb74..9f1eab6641 100644
--- a/services/datamanager/summary/file.go
+++ b/services/datamanager/summary/file.go
@@ -9,7 +9,6 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/logger"
 	"git.curoverse.com/arvados.git/services/datamanager/collection"
 	"git.curoverse.com/arvados.git/services/datamanager/keep"
-	"git.curoverse.com/arvados.git/services/datamanager/loggerutil"
 	"log"
 	"os"
 )
@@ -89,13 +88,13 @@ func ReadData(arvLogger *logger.Logger,
 	readCollections *collection.ReadCollections,
 	keepServerInfo *keep.ReadServers) {
 	if readDataFrom == "" {
-		loggerutil.FatalWithMessage(arvLogger,
-			"ReadData() called with empty filename.")
+		readCollections.Err = fmt.Errorf("ReadData() called with empty filename.")
+		return
 	} else {
 		summaryFile, err := os.Open(readDataFrom)
 		if err != nil {
-			loggerutil.FatalWithMessage(arvLogger,
-				fmt.Sprintf("Failed to open %s: %v", readDataFrom, err))
+			readCollections.Err = err
+			return
 		}
 		defer summaryFile.Close()
 
@@ -103,8 +102,8 @@ func ReadData(arvLogger *logger.Logger,
 		data := serializedData{}
 		err = dec.Decode(&data)
 		if err != nil {
-			loggerutil.FatalWithMessage(arvLogger,
-				fmt.Sprintf("Failed to read summary data: %v", err))
+			readCollections.Err = err
+			return
 		}
 
 		// re-summarize data, so that we can update our summarizing