projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6221: Add trash_list_test.go
[arvados.git]
/
services
/
datamanager
/
keep
/
keep.go
diff --git
a/services/datamanager/keep/keep.go
b/services/datamanager/keep/keep.go
index 112823ed5fed036b3d29a257086dd41dc93b5582..871acc8e793929b909b1256b3ff7e14a90059eba 100644
(file)
--- a/
services/datamanager/keep/keep.go
+++ b/
services/datamanager/keep/keep.go
@@
-87,10
+87,10
@@
func init() {
// TODO(misha): Change this to include the UUID as well.
func (s ServerAddress) String() string {
// TODO(misha): Change this to include the UUID as well.
func (s ServerAddress) String() string {
- return s.
HostPort
()
+ return s.
URL
()
}
}
-func (s ServerAddress)
HostPort
() string {
+func (s ServerAddress)
URL
() string {
if s.SSL {
return fmt.Sprintf("https://%s:%d", s.Host, s.Port)
} else {
if s.SSL {
return fmt.Sprintf("https://%s:%d", s.Host, s.Port)
} else {
@@
-497,9
+497,7
@@
func SendTrashLists(arvLogger *logger.Logger, kc *keepclient.KeepClient, spl map
return
}
return
}
- if resp.StatusCode != http.StatusOK {
- log.Printf("Error sending trash list to %v error: %v", url, err.Error())
- }
+ log.Printf("Sent trash list to %v: response was HTTP %d", url, resp.Status)
io.Copy(ioutil.Discard, resp.Body)
resp.Body.Close()
io.Copy(ioutil.Discard, resp.Body)
resp.Body.Close()