From 24215fb3eb134a4abf88d9b6fd2cc893bf550712 Mon Sep 17 00:00:00 2001 From: DennisMao Date: Wed, 2 Jan 2019 15:37:41 +0800 Subject: [PATCH 1/3] update dependency --- go.mod | 2 +- logs/es/es.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 9b3eb08e..a7e1194b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ require ( github.com/Knetic/govaluate v3.0.0+incompatible // indirect github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542 - github.com/belogik/goes v0.0.0-20151229125003-e54d722c3aff + github.com/OwnLocal/goes v1.0.0 github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737 github.com/casbin/casbin v1.7.0 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 diff --git a/logs/es/es.go b/logs/es/es.go index 22f4f650..9c0b830d 100644 --- a/logs/es/es.go +++ b/logs/es/es.go @@ -9,7 +9,7 @@ import ( "time" "github.com/astaxie/beego/logs" - "github.com/belogik/goes" + "github.com/OwnLocal/goes" ) // NewES return a LoggerInterface From 6e16b8cdcfec27bca8e7b62211381953e9a4bfde Mon Sep 17 00:00:00 2001 From: DennisMao Date: Wed, 2 Jan 2019 16:46:27 +0800 Subject: [PATCH 2/3] fix ci losing dependency --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ed04c9d1..97fc317b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ install: - go get github.com/Knetic/govaluate - go get github.com/casbin/casbin - go get github.com/elazarl/go-bindata-assetfs + - go get github.com/OwnLocal/goes - go get -u honnef.co/go/tools/cmd/gosimple - go get -u github.com/mdempsky/unconvert - go get -u github.com/gordonklaus/ineffassign From edb1c52dee08d36a1ab7031647d94068f2c93533 Mon Sep 17 00:00:00 2001 From: DennisMao Date: Wed, 2 Jan 2019 17:01:46 +0800 Subject: [PATCH 3/3] fix function changes --- logs/es/es.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/logs/es/es.go b/logs/es/es.go index 9c0b830d..9d6a615c 100644 --- a/logs/es/es.go +++ b/logs/es/es.go @@ -8,8 +8,8 @@ import ( "net/url" "time" - "github.com/astaxie/beego/logs" "github.com/OwnLocal/goes" + "github.com/astaxie/beego/logs" ) // NewES return a LoggerInterface @@ -21,7 +21,7 @@ func NewES() logs.Logger { } type esLogger struct { - *goes.Connection + *goes.Client DSN string `json:"dsn"` Level int `json:"level"` } @@ -41,8 +41,8 @@ func (el *esLogger) Init(jsonconfig string) error { } else if host, port, err := net.SplitHostPort(u.Host); err != nil { return err } else { - conn := goes.NewConnection(host, port) - el.Connection = conn + conn := goes.NewClient(host, port) + el.Client = conn } return nil } @@ -78,3 +78,4 @@ func (el *esLogger) Flush() { func init() { logs.Register(logs.AdapterEs, NewES) } +