[ARVADOS] updated: 97a2555a220d424b029d39b6b6e62f28bc3bc148
git at public.curoverse.com
git at public.curoverse.com
Tue Nov 18 12:49:11 EST 2014
Summary of changes:
doc/api/methods/jobs.html.textile.liquid | 6 +-
.../app/controllers/arvados/v1/jobs_controller.rb | 84 +++++++++++++---------
services/api/test/fixtures/jobs.yml | 17 +++++
.../arvados/v1/job_reuse_controller_test.rb | 81 ++++++++++++++-------
services/api/test/unit/job_test.rb | 11 ++-
services/keepstore/handler_test.go | 12 ++--
services/keepstore/keepstore.go | 8 +--
services/keepstore/logging_router.go | 45 +++++-------
8 files changed, 164 insertions(+), 100 deletions(-)
via 97a2555a220d424b029d39b6b6e62f28bc3bc148 (commit)
via 3ce8039e7ca278e4816ca90cd973bdbe08404b87 (commit)
via c621e2e901f5b5de4f72b1c6a9d8816aa5745292 (commit)
via aea8c62eaec4d170842b01e0fd1ddb5e256152b8 (commit)
via 14b762d2dd37a0a533532839aaf0488c11205e42 (commit)
via 1a520a700456325a8a7427d74fa11ed15b62a4b2 (commit)
via e82958936210b6bbc8cc04b237229fdf6fac295c (commit)
from 07bf4bb6d787c276f338846eb46c2b527a323896 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 97a2555a220d424b029d39b6b6e62f28bc3bc148
Author: radhika <radhika at curoverse.com>
Date: Tue Nov 18 12:37:22 2014 -0500
4194: use go fmt to replace spaces with tabs.
diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index d1be04a..a954d2b 100644
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -276,10 +276,10 @@ func TestIndexHandler(t *testing.T) {
// -------------------------------------------------------------
// Only the superuser should be allowed to issue /index requests.
- // ---------------------------
- // enforce_permissions enabled
+ // ---------------------------
+ // enforce_permissions enabled
// This setting should not affect tests passing.
- enforce_permissions = true
+ enforce_permissions = true
// unauthenticated /index request
// => UnauthorizedError
@@ -334,8 +334,6 @@ func TestIndexHandler(t *testing.T) {
http.StatusOK,
response)
-
-
expected := `^` + TEST_HASH + `\+\d+ \d+\n` +
TEST_HASH_2 + `\+\d+ \d+\n$`
match, _ := regexp.MatchString(expected, response.Body.String())
@@ -731,8 +729,8 @@ func IssueRequest(rt *RequestTester) *httptest.ResponseRecorder {
if rt.api_token != "" {
req.Header.Set("Authorization", "OAuth2 "+rt.api_token)
}
- loggingRouter := MakeLoggingRESTRouter()
- loggingRouter.ServeHTTP(response, req)
+ loggingRouter := MakeLoggingRESTRouter()
+ loggingRouter.ServeHTTP(response, req)
return response
}
diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 3c6d634..75b6c40 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -263,10 +263,10 @@ func main() {
KeepVM = MakeRRVolumeManager(goodvols)
// Tell the built-in HTTP server to direct all requests to the REST router.
- loggingRouter := MakeLoggingRESTRouter()
- http.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
- loggingRouter.ServeHTTP(resp, req)
- })
+ loggingRouter := MakeLoggingRESTRouter()
+ http.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
+ loggingRouter.ServeHTTP(resp, req)
+ })
// Set up a TCP listener.
listener, err := net.Listen("tcp", listen)
diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index 251da3a..6927019 100644
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -10,36 +10,36 @@ import (
)
type LoggingResponseWriter struct {
- Status int
- Length int
- http.ResponseWriter
+ Status int
+ Length int
+ http.ResponseWriter
}
func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
- loggingWriter.Status = code
- loggingWriter.ResponseWriter.WriteHeader(code)
+ loggingWriter.Status = code
+ loggingWriter.ResponseWriter.WriteHeader(code)
}
-func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){
- loggingWriter.Length = len(data)
- return loggingWriter.ResponseWriter.Write(data)
+func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error) {
+ loggingWriter.Length = len(data)
+ return loggingWriter.ResponseWriter.Write(data)
}
type LoggingRESTRouter struct {
- router *mux.Router
+ router *mux.Router
}
-func MakeLoggingRESTRouter() (*LoggingRESTRouter) {
- router := MakeRESTRouter()
- return (&LoggingRESTRouter{router})
+func MakeLoggingRESTRouter() *LoggingRESTRouter {
+ router := MakeRESTRouter()
+ return (&LoggingRESTRouter{router})
}
func (loggingRouter *LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
- loggingWriter := LoggingResponseWriter{200, 0, resp}
- loggingRouter.router.ServeHTTP(&loggingWriter, req)
- if loggingWriter.Status == 200 {
- log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
- } else {
- log.Printf("[%s] %s %s %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status)
- }
+ loggingWriter := LoggingResponseWriter{200, 0, resp}
+ loggingRouter.router.ServeHTTP(&loggingWriter, req)
+ if loggingWriter.Status == 200 {
+ log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
+ } else {
+ log.Printf("[%s] %s %s %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status)
+ }
}
commit 3ce8039e7ca278e4816ca90cd973bdbe08404b87
Author: radhika <radhika at curoverse.com>
Date: Tue Nov 18 12:29:33 2014 -0500
4194: just print data size and never the data
diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index 19f6866..251da3a 100644
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -4,7 +4,6 @@ package main
// LoggingResponseWriter
import (
- "bytes"
"github.com/gorilla/mux"
"log"
"net/http"
@@ -12,7 +11,7 @@ import (
type LoggingResponseWriter struct {
Status int
- Data *bytes.Buffer
+ Length int
http.ResponseWriter
}
@@ -22,7 +21,7 @@ func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
}
func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){
- loggingWriter.Data.Write(data)
+ loggingWriter.Length = len(data)
return loggingWriter.ResponseWriter.Write(data)
}
@@ -36,16 +35,10 @@ func MakeLoggingRESTRouter() (*LoggingRESTRouter) {
}
func (loggingRouter *LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
- loggingWriter := LoggingResponseWriter{200, bytes.NewBuffer(make([]byte, 0, 0)), resp}
+ loggingWriter := LoggingResponseWriter{200, 0, resp}
loggingRouter.router.ServeHTTP(&loggingWriter, req)
if loggingWriter.Status == 200 {
- if loggingWriter.Data.Len() > 200 { // could be large block, so just print the size
- log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:],
- loggingWriter.Status, loggingWriter.Data.Len())
- } else { // this could be a hash or status or a small block etc
- log.Printf("[%s] %s %s %d %s", req.RemoteAddr, req.Method, req.URL.Path[1:],
- loggingWriter.Status, loggingWriter.Data)
- }
+ log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
} else {
log.Printf("[%s] %s %s %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status)
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list