[ARVADOS] updated: 1.1.0-191-g062912d

[Git user]

Summary of changes:
 sdk/go/httpserver/logger_test.go | 68 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 sdk/go/httpserver/logger_test.go

       via  062912dab12af62beab4d585584c0ccfc700af20 (commit)
      from  76ebbe5955988735c14d48d12db6a06024882d2b (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 062912dab12af62beab4d585584c0ccfc700af20
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Nov 29 10:37:05 2017 -0500

    12167: Test LogRequests() and AddRequestIDs().
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/go/httpserver/logger_test.go b/sdk/go/httpserver/logger_test.go
new file mode 100644
index 0000000..5b54f32
--- /dev/null
+++ b/sdk/go/httpserver/logger_test.go
@@ -0,0 +1,68 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package httpserver
+
+import (
+	"bytes"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"testing"
+	"time"
+
+	log "github.com/Sirupsen/logrus"
+	check "gopkg.in/check.v1"
+)
+
+func Test(t *testing.T) {
+	check.TestingT(t)
+}
+
+var _ = check.Suite(&Suite{})
+
+type Suite struct{}
+
+func (s *Suite) TestLogRequests(c *check.C) {
+	defer log.SetOutput(os.Stdout)
+	captured := &bytes.Buffer{}
+	log.SetOutput(captured)
+	log.SetFormatter(&log.JSONFormatter{
+		TimestampFormat: time.RFC3339Nano,
+	})
+	h := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		w.Write([]byte("hello world"))
+	})
+	req, err := http.NewRequest("GET", "https://foo.example/bar", nil)
+	req.Header.Set("X-Forwarded-For", "1.2.3.4:12345")
+	c.Assert(err, check.IsNil)
+	resp := httptest.NewRecorder()
+	AddRequestIDs(LogRequests(h)).ServeHTTP(resp, req)
+
+	dec := json.NewDecoder(captured)
+
+	gotReq := make(map[string]interface{})
+	err = dec.Decode(&gotReq)
+	c.Logf("%#v", gotReq)
+	c.Check(gotReq["RequestID"], check.Matches, "req-[a-z0-9]+")
+	c.Check(gotReq["reqForwardedFor"], check.Equals, "1.2.3.4:12345")
+	c.Check(gotReq["msg"], check.Equals, "request")
+
+	gotResp := make(map[string]interface{})
+	err = dec.Decode(&gotResp)
+	c.Logf("%#v", gotResp)
+	c.Check(gotResp["RequestID"], check.Equals, gotReq["RequestID"])
+	c.Check(gotResp["reqForwardedFor"], check.Equals, "1.2.3.4:12345")
+	c.Check(gotResp["msg"], check.Equals, "response")
+
+	c.Assert(gotResp["time"], check.FitsTypeOf, "")
+	_, err = time.Parse(time.RFC3339Nano, gotResp["time"].(string))
+	c.Check(err, check.IsNil)
+
+	for _, key := range []string{"timeToStatus", "timeWriteBody", "timeTotal"} {
+		c.Assert(gotResp[key], check.FitsTypeOf, float64(0))
+		c.Check(gotResp[key].(float64), check.Not(check.Equals), float64(0))
+	}
+}

-----------------------------------------------------------------------


hooks/post-receive
--