projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4194-keep-logging
[arvados.git]
/
services
/
keepstore
/
handlers.go
diff --git
a/services/keepstore/handlers.go
b/services/keepstore/handlers.go
index 27d1e908c56ab46d535fc97bc1f2b79bf349387a..bd1ca67bfc26643190b2e94a0169bc58f2030c88 100644
(file)
--- a/
services/keepstore/handlers.go
+++ b/
services/keepstore/handlers.go
@@
-136,7
+136,6
@@
func GetBlockHandler(resp http.ResponseWriter, req *http.Request) {
// presumed to be valid and ignored, to permit forward compatibility.
} else {
// Unknown format; not a valid locator.
// presumed to be valid and ignored, to permit forward compatibility.
} else {
// Unknown format; not a valid locator.
- log.Printf("%s %s %d %s", req.Method, hash, BadRequestError.HTTPCode, "-")
http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
return
}
http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
return
}
@@
-147,17
+146,14
@@
func GetBlockHandler(resp http.ResponseWriter, req *http.Request) {
// request's permission signature.
if enforce_permissions {
if signature == "" || timestamp == "" {
// request's permission signature.
if enforce_permissions {
if signature == "" || timestamp == "" {
- log.Printf("%s %s %d %s", req.Method, hash, PermissionError.HTTPCode, "-")
http.Error(resp, PermissionError.Error(), PermissionError.HTTPCode)
return
} else if IsExpired(timestamp) {
http.Error(resp, PermissionError.Error(), PermissionError.HTTPCode)
return
} else if IsExpired(timestamp) {
- log.Printf("%s %s %d %s", req.Method, hash, ExpiredError.HTTPCode, "-")
http.Error(resp, ExpiredError.Error(), ExpiredError.HTTPCode)
return
} else {
req_locator := req.URL.Path[1:] // strip leading slash
if !VerifySignature(req_locator, GetApiToken(req)) {
http.Error(resp, ExpiredError.Error(), ExpiredError.HTTPCode)
return
} else {
req_locator := req.URL.Path[1:] // strip leading slash
if !VerifySignature(req_locator, GetApiToken(req)) {
- log.Printf("%s %s %d %s", req.Method, hash, PermissionError.HTTPCode, "-")
http.Error(resp, PermissionError.Error(), PermissionError.HTTPCode)
return
}
http.Error(resp, PermissionError.Error(), PermissionError.HTTPCode)
return
}
@@
-175,10
+171,6
@@
func GetBlockHandler(resp http.ResponseWriter, req *http.Request) {
if err != nil {
// This type assertion is safe because the only errors
// GetBlock can return are DiskHashError or NotFoundError.
if err != nil {
// This type assertion is safe because the only errors
// GetBlock can return are DiskHashError or NotFoundError.
- if err == NotFoundError {
- log.Printf("%s: not found, giving up\n", hash)
- }
- log.Printf("%s %s %d %s", req.Method, hash, err.(*KeepError).HTTPCode, "-")
http.Error(resp, err.Error(), err.(*KeepError).HTTPCode)
return
}
http.Error(resp, err.Error(), err.(*KeepError).HTTPCode)
return
}
@@
-186,11
+178,6
@@
func GetBlockHandler(resp http.ResponseWriter, req *http.Request) {
resp.Header().Set("X-Block-Size", fmt.Sprintf("%d", len(block)))
_, err = resp.Write(block)
resp.Header().Set("X-Block-Size", fmt.Sprintf("%d", len(block)))
_, err = resp.Write(block)
- if err != nil {
- log.Printf("%s %s %d %s", req.Method, hash, err.(*KeepError).HTTPCode, len(block), "-")
- } else {
- log.Printf("%s %s %d %d", req.Method, hash, 200, len(block))
- }
return
}
return
}
@@
-206,7
+193,6
@@
func PutBlockHandler(resp http.ResponseWriter, req *http.Request) {
// If the request exceeds BLOCKSIZE bytes, issue a HTTP 500 error.
//
if req.ContentLength > BLOCKSIZE {
// If the request exceeds BLOCKSIZE bytes, issue a HTTP 500 error.
//
if req.ContentLength > BLOCKSIZE {
- log.Printf("%s %s %d %d", req.Method, hash, TooLongError.HTTPCode, req.ContentLength)
http.Error(resp, TooLongError.Error(), TooLongError.HTTPCode)
return
}
http.Error(resp, TooLongError.Error(), TooLongError.HTTPCode)
return
}
@@
-214,10
+200,8
@@
func PutBlockHandler(resp http.ResponseWriter, req *http.Request) {
buf := make([]byte, req.ContentLength)
nread, err := io.ReadFull(req.Body, buf)
if err != nil {
buf := make([]byte, req.ContentLength)
nread, err := io.ReadFull(req.Body, buf)
if err != nil {
- log.Printf("%s %s %d %d", req.Method, hash, 500, req.ContentLength)
http.Error(resp, err.Error(), 500)
} else if int64(nread) < req.ContentLength {
http.Error(resp, err.Error(), 500)
} else if int64(nread) < req.ContentLength {
- log.Printf("%s %s %d %d", req.Method, hash, 500, req.ContentLength)
http.Error(resp, "request truncated", 500)
} else {
if err := PutBlock(buf, hash); err == nil {
http.Error(resp, "request truncated", 500)
} else {
if err := PutBlock(buf, hash); err == nil {
@@
-229,11
+213,9
@@
func PutBlockHandler(resp http.ResponseWriter, req *http.Request) {
expiry := time.Now().Add(permission_ttl)
return_hash = SignLocator(return_hash, api_token, expiry)
}
expiry := time.Now().Add(permission_ttl)
return_hash = SignLocator(return_hash, api_token, expiry)
}
- log.Printf("%s %s %d %d", req.Method, hash, 200, req.ContentLength)
resp.Write([]byte(return_hash + "\n"))
} else {
ke := err.(*KeepError)
resp.Write([]byte(return_hash + "\n"))
} else {
ke := err.(*KeepError)
- log.Printf("%s %s %d %d", req.Method, hash, ke.HTTPCode, req.ContentLength)
http.Error(resp, ke.Error(), ke.HTTPCode)
}
}
http.Error(resp, ke.Error(), ke.HTTPCode)
}
}
@@
-247,7
+229,6
@@
func IndexHandler(resp http.ResponseWriter, req *http.Request) {
// Reject unauthorized requests.
if !IsDataManagerToken(GetApiToken(req)) {
http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
// Reject unauthorized requests.
if !IsDataManagerToken(GetApiToken(req)) {
http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
- log.Printf("%s %s: %s\n", req.Method, req.URL, UnauthorizedError.Error())
return
}
return
}
@@
-364,7
+345,6
@@
func GetVolumeStatus(volume string) *VolumeStatus {
//
func DeleteHandler(resp http.ResponseWriter, req *http.Request) {
hash := mux.Vars(req)["hash"]
//
func DeleteHandler(resp http.ResponseWriter, req *http.Request) {
hash := mux.Vars(req)["hash"]
- log.Printf("%s %s", req.Method, hash)
// Confirm that this user is an admin and has a token with unlimited scope.
var tok = GetApiToken(req)
// Confirm that this user is an admin and has a token with unlimited scope.
var tok = GetApiToken(req)
@@
-458,7
+438,6
@@
func PullHandler(resp http.ResponseWriter, req *http.Request) {
// Reject unauthorized requests.
if !IsDataManagerToken(GetApiToken(req)) {
http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
// Reject unauthorized requests.
if !IsDataManagerToken(GetApiToken(req)) {
http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
- log.Printf("%s %s: %s\n", req.Method, req.URL, UnauthorizedError.Error())
return
}
return
}
@@
-467,14
+446,12
@@
func PullHandler(resp http.ResponseWriter, req *http.Request) {
r := json.NewDecoder(req.Body)
if err := r.Decode(&pr); err != nil {
http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
r := json.NewDecoder(req.Body)
if err := r.Decode(&pr); err != nil {
http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
- log.Printf("%s %s: %s\n", req.Method, req.URL, err.Error())
return
}
// We have a properly formatted pull list sent from the data
// manager. Report success and send the list to the pull list
// manager for further handling.
return
}
// We have a properly formatted pull list sent from the data
// manager. Report success and send the list to the pull list
// manager for further handling.
- log.Printf("%s %s: received %v\n", req.Method, req.URL, pr)
resp.WriteHeader(http.StatusOK)
resp.Write([]byte(
fmt.Sprintf("Received %d pull requests\n", len(pr))))
resp.WriteHeader(http.StatusOK)
resp.Write([]byte(
fmt.Sprintf("Received %d pull requests\n", len(pr))))
@@
-499,7
+476,6
@@
func TrashHandler(resp http.ResponseWriter, req *http.Request) {
// Reject unauthorized requests.
if !IsDataManagerToken(GetApiToken(req)) {
http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
// Reject unauthorized requests.
if !IsDataManagerToken(GetApiToken(req)) {
http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
- log.Printf("%s %s: %s\n", req.Method, req.URL, UnauthorizedError.Error())
return
}
return
}
@@
-508,14
+484,12
@@
func TrashHandler(resp http.ResponseWriter, req *http.Request) {
r := json.NewDecoder(req.Body)
if err := r.Decode(&trash); err != nil {
http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
r := json.NewDecoder(req.Body)
if err := r.Decode(&trash); err != nil {
http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
- log.Printf("%s %s: %s\n", req.Method, req.URL, err.Error())
return
}
// We have a properly formatted trash list sent from the data
// manager. Report success and send the list to the trash work
// queue for further handling.
return
}
// We have a properly formatted trash list sent from the data
// manager. Report success and send the list to the trash work
// queue for further handling.
- log.Printf("%s %s: received %v\n", req.Method, req.URL, trash)
resp.WriteHeader(http.StatusOK)
resp.Write([]byte(
fmt.Sprintf("Received %d trash requests\n", len(trash))))
resp.WriteHeader(http.StatusOK)
resp.Write([]byte(
fmt.Sprintf("Received %d trash requests\n", len(trash))))