projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7748: use local variables for arvLogger.Update
[arvados.git]
/
services
/
datamanager
/
summary
/
file.go
diff --git
a/services/datamanager/summary/file.go
b/services/datamanager/summary/file.go
index 63c8adeb745b05b6f8886751cc135b78b0fd8d87..9f1eab6641f288d50cfa68cab42c10e911a7ba81 100644
(file)
--- 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/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"
)
"log"
"os"
)
@@
-89,13
+88,13
@@
func ReadData(arvLogger *logger.Logger,
readCollections *collection.ReadCollections,
keepServerInfo *keep.ReadServers) {
if readDataFrom == "" {
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 {
} 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()
}
defer summaryFile.Close()
@@
-103,8
+102,8
@@
func ReadData(arvLogger *logger.Logger,
data := serializedData{}
err = dec.Decode(&data)
if err != nil {
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
}
// re-summarize data, so that we can update our summarizing