upgrade lager (#395)

core/registry/bootstrap.go

@@ -117,7 +117,7 @@ func refreshDependency(service *MicroService) error {
 
 // RegisterMicroserviceInstances register micro-service instances
 func RegisterMicroserviceInstances() error {
-	lager.Logger.Info("Start to register instance.", nil)
+	lager.Logger.Info("Start to register instance.")
 	service := config.MicroserviceDefinition
 	var err error
 

core/registry/discovery.go

@@ -80,7 +80,7 @@ func enableContractDiscovery(opts Options) {
 	}
 	f := cdFunc[t]
 	if f == nil {
-		lager.Logger.Warn("No contract discovery plugin", nil)
+		lager.Logger.Warn("No contract discovery plugin")
 		return
 	}
 	DefaultContractDiscoveryService = f(opts)

core/registry/heartbeat.go

@@ -136,7 +136,7 @@ func (s *HeartbeatService) RetryRegister(sid, iid string) error {
 			break
 		}
 	}
-	lager.Logger.Warn("Re-register self success", nil)
+	lager.Logger.Warn("Re-register self success")
 	return nil
 }
 

core/router/cse/darklaunch.go

@@ -9,6 +9,7 @@ import (
 	"github.com/go-chassis/go-chassis/core/archaius"
 	"github.com/go-chassis/go-chassis/core/config/model"
 	"github.com/go-chassis/go-chassis/core/lager"
+	"github.com/go-mesh/openlogging"
 )
 
 // RouteDarkLaunchGovernSourceName is source name of dark launch configuration
@@ -104,7 +105,7 @@ func (r *RouteDarkLaunchGovernSource) Callback(e *core.Event) {
 	}
 	lager.Logger.Debugf("Get event, key: %s, type: %s", e.Key, e.EventType)
 	if r.d == nil {
-		lager.Logger.Warn("Dynamic config handler is nil", nil)
+		openlogging.GetLogger().Warn("Dynamic config handler is nil")
 		return
 	}
 	r.d.OnEvent(e)

core/router/cse/router_manager.go

@@ -11,6 +11,7 @@ import (
 	"github.com/go-chassis/go-chassis/core/lager"
 	"github.com/go-chassis/go-chassis/core/router"
 	wp "github.com/go-chassis/go-chassis/core/router/weightpool"
+	"github.com/go-mesh/openlogging"
 )
 
 const routeFileSourceName = "RouteFileSource"
@@ -23,7 +24,7 @@ type routeRuleEventListener struct{}
 // update route rule of a service
 func (r *routeRuleEventListener) Event(e *core.Event) {
 	if e == nil {
-		lager.Logger.Warn("Event pointer is nil", nil)
+		openlogging.GetLogger().Warn("Event pointer is nil")
 		return
 	}
 

core/router/pilot/pilotsource.go

@@ -16,6 +16,7 @@ import (
 	wp "github.com/go-chassis/go-chassis/core/router/weightpool"
 	"github.com/go-chassis/go-chassis/pkg/istio/client"
 	"github.com/go-chassis/go-chassis/pkg/istio/util"
+	"github.com/go-mesh/openlogging"
 )
 
 const routePilotSourceName = "RoutePilotSource"
@@ -260,7 +261,7 @@ type pilotEventListener struct{}
 // update route rule of a service
 func (r *pilotEventListener) Event(e *core.Event) {
 	if e == nil {
-		lager.Logger.Warn("pilot event pointer is nil", nil)
+		lager.Logger.Warn("pilot event pointer is nil")
 		return
 	}
 
@@ -272,7 +273,7 @@ func (r *pilotEventListener) Event(e *core.Event) {
 	}
 	routeRules, ok := v.([]*model.RouteRule)
 	if !ok {
-		lager.Logger.Error("value of pilot is not type []*RouteRule", nil)
+		openlogging.GetLogger().Error("value of pilot is not type []*RouteRule")
 		return
 	}
 

docs/user-guides/invoker.md

@@ -1,15 +1,15 @@
 # Invoker
-## 概述
+## Introduction
 
 ---
 
-框架提供Rest调用与RPC调用2种方式
+Invoker is the entry point for a developer to call remote service
 
 ## API
 
-#### Rest调用
+#### Rest Invoker
 
-使用NewRestInvoker创建一个invoker实例，可接受chain, filters等自定义选项
+使用NewRestInvoker创建一个invoker实例，可接受chain等自定义选项
 
 ContextDo可以接受一个http request作为参数，开发者可通过request的API对request进行操作，并作为参数传入该方法
 
@@ -18,7 +18,7 @@ func NewRestInvoker(opt ...Option) *RestInvoker
 func (ri *RestInvoker) ContextDo(ctx context.Context, req *rest.Request, options ...InvocationOption) (*rest.Response, error)
 ```
 
-#### RPC调用
+#### RPC Invoker
 
 使用NewRPCInvoker创建invoker实例，可接受chain, filters等自定义选项
 
@@ -33,7 +33,7 @@ func (ri *RPCInvoker) Invoke(ctx context.Context, microServiceName, schemaID, op
 
 无论Rest还是RPC调用方法都能够接受多种选项对一次调用进行控制，参考options.go查看更多选项
 
-## 示例
+## Examples
 
 #### RPC
 
@@ -58,5 +58,25 @@ defer req.Close()
 resp, err := core.NewRestInvoker(core.ChainName("custom")).ContextDo(context.TODO(), req)
 ```
 
+#### Multiple Port
+if you define different port for the same protocol, like below
+```go
+cse:
+  protocols:
+    rest:
+      listenAddress: 0.0.0.0:5000
+    rest-admin:
+      listenAddress: 0.0.0.0:5001
+```
+then you can use suffix "admin" as port to access rest-admin server
+```go
+req, _ := rest.NewRequest("GET", "cse://RESTServer:admin/sayhello/world")
+```
+use only service name to access rest server
+```go
+req, _ := rest.NewRequest("GET", "cse://RESTServer/sayhello/world")
+```
+
+
 
 

go.mod

@@ -21,9 +21,9 @@ require (
 	github.com/go-chassis/go-cc-client v0.0.0-20180831085349-c2bb6cef1640
 	github.com/go-chassis/go-chassis-plugins v0.0.0-20180731065901-7b05d8d2fbe6
 	github.com/go-chassis/go-sc-client v0.0.0-20180831081217-8135c6df7f96
-	github.com/go-chassis/paas-lager v0.0.0-20180831030822-312e8737a225
+	github.com/go-chassis/paas-lager master
 	github.com/go-logfmt/logfmt v0.3.0 // indirect
-	github.com/go-mesh/openlogging v0.0.0-20180831021158-f5d1c4e7e506
+	github.com/go-mesh/openlogging master
 	github.com/go-ole/go-ole v1.2.1 // indirect
 	github.com/gogo/googleapis v1.1.0 // indirect
 	github.com/gogo/protobuf v1.1.1 // indirect

server/restful/restful_server.go

@@ -225,8 +225,8 @@ func (r *restfulServer) Start() error {
 			err = r.server.ListenAndServe()
 		}
 		if err != nil {
-			lager.Logger.Error("Can't start http server",
-				openlogging.Tags{"err": err.Error()})
+			openlogging.GetLogger().Error("Can't start http server",
+				openlogging.WithTags(openlogging.Tags{"err": err.Error()}))
 			server.ErrRuntime <- err
 		}