Tests for logging

Signed-off-by: Vishal Rana <[email protected]>

Author: vishr

.travis.yml

@@ -0,0 +1,14 @@
+language: go
+go:
+  - 1.7
+  - 1.8
+  - tip
+install:
+  - make dependency
+script:
+  - make test
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+matrix:
+  allow_failures:
+    - go: tip

Gopkg.lock

@@ -24,3 +24,7 @@
 [[constraint]]
   name = "github.com/dghubble/sling"
   version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.1.4"

Gopkg.toml

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 LabStack
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE

@@ -0,0 +1,10 @@
+dependency:
+	go get -u github.com/golang/dep/cmd/dep
+	dep ensure -update
+
+test:
+	echo "" > coverage.txt
+	for d in $(shell go list ./... | grep -v vendor); do \
+		go test -race -coverprofile=profile.out -covermode=atomic $$d || exit 1; \
+		[ -f profile.out ] && cat profile.out >> coverage.txt && rm profile.out; \
+	done

Makefile

@@ -1 +1,9 @@
 # LabStack Go Client
+
+
+[![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/labstack/labstack-go)
+[![Go Report Card](https://goreportcard.com/badge/github.com/labstack/labstack-go?style=flat-square)](https://goreportcard.com/report/github.com/labstack/labstack-go)
+[![Build Status](http://img.shields.io/travis/labstack/labstack-go.svg?style=flat-square)](https://travis-ci.org/labstack/labstack-go)
+[![Codecov](https://img.shields.io/codecov/c/github/labstack/labstack-go.svg?style=flat-square)](https://codecov.io/gh/labstack/labstack-go) [![Forum](https://img.shields.io/badge/community-forum-00afd1.svg?style=flat-square)](https://forum.labstack.com)
+[![Twitter](https://img.shields.io/badge/[email protected]?style=flat-square)](https://twitter.com/labstack)
+[![License](http://img.shields.io/badge/license-mit-blue.svg?style=flat-square)](https://raw.githubusercontent.com/labstack/labstack-go/master/LICENSE)

README.md

@@ -98,7 +98,7 @@ func (c *Cube) dispatch() (err error) {
 		return
 	}
 	if res.StatusCode != http.StatusNoContent {
-		return fmt.Errorf("cube: requests dispatching error=%s", err)
+		return fmt.Errorf("cube: error dispatching requests, status=%d, message=%v", res.StatusCode, err)
 	}
 	return
 }

cube.go

@@ -15,7 +15,7 @@ type (
 	}
 )
 
-const (
+var (
 	apiURL = "https://api.labstack.com"
 )
 

labstack.go

@@ -85,7 +85,7 @@ func (l *Logging) dispatch() (err error) {
 		return
 	}
 	if res.StatusCode != http.StatusNoContent {
-		return fmt.Errorf("cube: requests dispatching error=%s", err)
+		return fmt.Errorf("logging: error dispatching logs, status=%d, message=%v", res.StatusCode, err)
 	}
 	return
 }
@@ -112,35 +112,45 @@ func (c *Client) Logging() (logging *Logging) {
 
 // Debug logs a debug message.
 func (l *Logging) Debug(format string, args ...interface{}) {
-	l.Log(DEBUG, format, args)
+	l.Log(DEBUG, format, args...)
 }
 
 // Info logs an informational message.
 func (l *Logging) Info(format string, args ...interface{}) {
-	l.Log(INFO, format, args)
+	l.Log(INFO, format, args...)
 }
 
 // Warn logs a warning message.
 func (l *Logging) Warn(format string, args ...interface{}) {
-	l.Log(WARN, format, args)
+	l.Log(WARN, format, args...)
 }
 
 // Error logs an error message.
 func (l *Logging) Error(format string, args ...interface{}) {
-	l.Log(ERROR, format, args)
+	l.Log(ERROR, format, args...)
 }
 
 // Log logs a message with log level.
 func (l *Logging) Log(level, format string, args ...interface{}) {
-	if levels[l.Level] < levels[level] {
+	if levels[level] < levels[l.Level] {
 		return
 	}
-	message := fmt.Sprintf(format, args)
+	message := fmt.Sprintf(format, args...)
 	log := &Log{
-		Time:    time.Now().Format(time.RFC3339),
+		Time:    time.Now().Format(RFC3339Milli),
 		Module:  l.Module,
 		Level:   level,
 		Message: message,
 	}
-	l.sling.Post("").BodyJSON(log).ReceiveSuccess(nil)
+	l.appendLog(log)
+
+	// Dispatch batch
+	if l.logsLength() >= l.BatchSize {
+		go func() {
+			if err := l.dispatch(); err != nil {
+				l.logger.Error(err)
+			}
+			l.resetLogs()
+		}()
+	}
 }

logging.go

@@ -0,0 +1,69 @@
+package labstack
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLogging(t *testing.T) {
+	// dispatch
+	handler := func(w http.ResponseWriter, r *http.Request) {
+		logs := []*Log{}
+		if err := json.NewDecoder(r.Body).Decode(&logs); err == nil {
+			if assert.Len(t, logs, 1) {
+				assert.Equal(t, INFO, logs[0].Level)
+				assert.Equal(t, INFO, logs[0].Message)
+				w.WriteHeader(http.StatusNoContent)
+				return
+			}
+		}
+		w.WriteHeader(http.StatusInternalServerError)
+	}
+	ts := httptest.NewServer(http.HandlerFunc(handler))
+	defer ts.Close()
+	apiURL = ts.URL
+	l := NewClient("").Logging()
+	l.appendLog(&Log{
+		Level:   INFO,
+		Message: INFO,
+	})
+	assert.NoError(t, l.dispatch())
+
+	// Log
+	for _, level := range []string{DEBUG, INFO, WARN, ERROR} {
+		l := NewClient("").Logging()
+		l.Level = DEBUG
+		l.BatchSize = 1
+		switch level {
+		case DEBUG:
+			l.Debug("%s", DEBUG)
+		case INFO:
+			l.Info("%s", INFO)
+		case WARN:
+			l.Warn("%s", WARN)
+		case ERROR:
+			l.Error("%s", ERROR)
+		}
+		if assert.Equal(t, 1, l.logsLength()) {
+			log := l.logs[0]
+			assert.Equal(t, level, log.Level)
+			assert.Equal(t, level, log.Message)
+		}
+	}
+
+	// Level
+	l = NewClient("").Logging()
+	l.Level = ERROR
+	l.Debug("debug")
+	l.Info("info")
+	l.Warn("warn")
+	assert.Equal(t, 0, l.logsLength())
+	l.Level = INFO
+	l.Info("info")
+	l.Warn("warn")
+	assert.Equal(t, 2, l.logsLength())
+}

logging_test.go

@@ -6,6 +6,12 @@ import (
 	"strings"
 )
 
+// Time layouts
+const (
+	RFC3339Milli = "2006-01-02T15:04:05.000Z07:00"
+	RFC3339Micro = "2006-01-02T15:04:05.000000Z07:00"
+)
+
 func realIP(r *http.Request) string {
 	ra := r.RemoteAddr
 	if ip := r.Header.Get("X-Forwarded-For"); ip != "" {