This commit is contained in:
Markus Schulte
2017-06-20 16:23:02 +02:00
parent 7ceb900c37
commit 2de4e9fc73
5 changed files with 21 additions and 22 deletions
-1
View File
@@ -235,7 +235,6 @@ func ServerClosed(appName string) {
Logger.WithFields(fields).Infof("http server was closed: %v", appName)
}
func getRemoteIp(r *http.Request) string {
if r.Header.Get("X-Cluster-Client-Ip") != "" {
return r.Header.Get("X-Cluster-Client-Ip")
+3 -3
View File
@@ -4,8 +4,8 @@ import (
"bytes"
"encoding/json"
"errors"
"github.com/tarent/logrus"
"github.com/stretchr/testify/assert"
"github.com/tarent/logrus"
"net/http"
"os"
"testing"
@@ -319,7 +319,7 @@ func Test_Logger_Cacheinfo(t *testing.T) {
func Test_Logger_GetRemoteIp1(t *testing.T) {
a := assert.New(t)
req, _ := http.NewRequest("GET", "test.com", nil)
req.Header["X-Cluster-Client-Ip"] = []string {"1234"}
req.Header["X-Cluster-Client-Ip"] = []string{"1234"}
ret := getRemoteIp(req)
a.Equal("1234", ret)
}
@@ -327,7 +327,7 @@ func Test_Logger_GetRemoteIp1(t *testing.T) {
func Test_Logger_GetRemoteIp2(t *testing.T) {
a := assert.New(t)
req, _ := http.NewRequest("GET", "test.com", nil)
req.Header["X-Real-Ip"] = []string {"1234"}
req.Header["X-Real-Ip"] = []string{"1234"}
ret := getRemoteIp(req)
a.Equal("1234", ret)
}