// Now try to put the block through
var replicas int
- var err error
+ var put_err error
if hash == "" {
if bytes, err := ioutil.ReadAll(req.Body); err != nil {
msg := fmt.Sprintf("Error reading request body: %s", err)
http.Error(resp, msg, http.StatusInternalServerError)
return
} else {
- hash, replicas, err = kc.PutB(bytes)
+ hash, replicas, put_err = kc.PutB(bytes)
}
} else {
- hash, replicas, err = kc.PutHR(hash, req.Body, contentLength)
+ hash, replicas, put_err = kc.PutHR(hash, req.Body, contentLength)
}
// Tell the client how many successful PUTs we accomplished
resp.Header().Set(keepclient.X_Keep_Replicas_Stored, fmt.Sprintf("%d", replicas))
- switch err {
+ switch put_err {
case nil:
// Default will return http.StatusOK
log.Printf("%s: %s %s finished, stored %v replicas (desired %v)", GetRemoteAddress(req), req.Method, hash, replicas, kc.Want_replicas)
log.Printf("%s: wrote %v bytes to response body and got error %v", n, err2.Error())
}
} else {
- http.Error(resp, "", http.StatusServiceUnavailable)
+ http.Error(resp, put_err.Error(), http.StatusServiceUnavailable)
}
default:
- http.Error(resp, err.Error(), http.StatusBadGateway)
+ http.Error(resp, put_err.Error(), http.StatusBadGateway)
}
- if err != nil {
- log.Printf("%s: %s %s stored %v replicas (desired %v) got error %v", GetRemoteAddress(req), req.Method, hash, replicas, kc.Want_replicas, err.Error())
+ if put_err != nil {
+ log.Printf("%s: %s %s stored %v replicas (desired %v) got error %v", GetRemoteAddress(req), req.Method, hash, replicas, kc.Want_replicas, put_err.Error())
}
}