Skip to content
Snippets Groups Projects
Commit 6d43359a authored by AlexStocks's avatar AlexStocks
Browse files

Imp: Add environment/default.timeout for go client schema;

Fix:change go server schema timeout/time unit from second to millisecond;
Fix: go client schema protocol from jsonrpc:// to consumer://
parent ccb2d302
No related branches found
Tags v0.1.1
No related merge requests found
...@@ -21,6 +21,7 @@ application_config: ...@@ -21,6 +21,7 @@ application_config:
module : "dubbogo user-info client" module : "dubbogo user-info client"
version : "0.0.1" version : "0.0.1"
owner : "ZX" owner : "ZX"
environment : "dev"
registry_config: registry_config:
timeout : "3s" timeout : "3s"
......
...@@ -21,6 +21,7 @@ application_config: ...@@ -21,6 +21,7 @@ application_config:
module : "dubbogo user-info client" module : "dubbogo user-info client"
version : "0.0.1" version : "0.0.1"
owner : "ZX" owner : "ZX"
environment : "product"
registry_config: registry_config:
timeout : "3s" timeout : "3s"
......
...@@ -21,6 +21,7 @@ application_config: ...@@ -21,6 +21,7 @@ application_config:
module : "dubbogo user-info client" module : "dubbogo user-info client"
version : "0.0.1" version : "0.0.1"
owner : "ZX" owner : "ZX"
environment : "test"
registry_config: registry_config:
timeout : "3s" timeout : "3s"
......
...@@ -15,7 +15,7 @@ application_config: ...@@ -15,7 +15,7 @@ application_config:
module : "dubbogo user-info server" module : "dubbogo user-info server"
version : "0.0.1" version : "0.0.1"
owner : "ZX" owner : "ZX"
environment: "dev" environment : "dev"
registry_config: registry_config:
timeout : "3s" timeout : "3s"
......
...@@ -15,7 +15,7 @@ application_config: ...@@ -15,7 +15,7 @@ application_config:
module : "dubbogo user-info server" module : "dubbogo user-info server"
version : "0.0.1" version : "0.0.1"
owner : "ZX" owner : "ZX"
environment: "product" environment : "product"
registry_config: registry_config:
timeout : "3s" timeout : "3s"
......
...@@ -15,7 +15,7 @@ application_config: ...@@ -15,7 +15,7 @@ application_config:
module : "dubbogo user-info server" module : "dubbogo user-info server"
version : "0.0.1" version : "0.0.1"
owner : "ZX" owner : "ZX"
environment: "test" environment : "test"
registry_config: registry_config:
timeout : "3s" timeout : "3s"
......
...@@ -123,7 +123,7 @@ func NewZkConsumerRegistry(opts ...Option) (*ZkConsumerRegistry, error) { ...@@ -123,7 +123,7 @@ func NewZkConsumerRegistry(opts ...Option) (*ZkConsumerRegistry, error) {
) )
r = &ZkConsumerRegistry{ r = &ZkConsumerRegistry{
birth: time.Now().Unix(), birth: time.Now().UnixNano(),
done: make(chan struct{}), done: make(chan struct{}),
services: make(map[string]ServiceConfigIf), services: make(map[string]ServiceConfigIf),
listenerServiceMap: make(map[string]*serviceArray), listenerServiceMap: make(map[string]*serviceArray),
...@@ -325,8 +325,11 @@ func (r *ZkConsumerRegistry) register(conf *ServiceConfig) error { ...@@ -325,8 +325,11 @@ func (r *ZkConsumerRegistry) register(conf *ServiceConfig) error {
} }
params = url.Values{} params = url.Values{}
params.Add("interface", conf.Service)
params.Add("application", r.ApplicationConfig.Name) params.Add("application", r.ApplicationConfig.Name)
params.Add("default.timeout", fmt.Sprintf("%d", defaultTimeout/1e6))
params.Add("environment", r.ApplicationConfig.Environment)
params.Add("protocol", conf.Protocol)
params.Add("interface", conf.Service)
revision = r.ApplicationConfig.Version revision = r.ApplicationConfig.Version
if revision == "" { if revision == "" {
revision = "0.1.0" revision = "0.1.0"
...@@ -343,12 +346,12 @@ func (r *ZkConsumerRegistry) register(conf *ServiceConfig) error { ...@@ -343,12 +346,12 @@ func (r *ZkConsumerRegistry) register(conf *ServiceConfig) error {
params.Add("side", (DubboType(CONSUMER)).Role()) params.Add("side", (DubboType(CONSUMER)).Role())
params.Add("pid", processID) params.Add("pid", processID)
params.Add("ip", localIP) params.Add("ip", localIP)
params.Add("timeout", fmt.Sprintf("%v", r.Timeout.Seconds())) params.Add("timeout", fmt.Sprintf("%d", int64(r.Timeout)/1e6))
params.Add("timestamp", fmt.Sprintf("%d", r.birth)) params.Add("timestamp", fmt.Sprintf("%d", r.birth/1e6))
if conf.Version != "" { if conf.Version != "" {
params.Add("version", conf.Version) params.Add("version", conf.Version)
} }
rawURL = fmt.Sprintf("%s://%s/%s?%s", conf.Protocol, localIP, conf.Service+conf.Version, params.Encode()) rawURL = fmt.Sprintf("consumer://%s/%s?%s", localIP, conf.Service+conf.Version, params.Encode())
encodedURL = url.QueryEscape(rawURL) encodedURL = url.QueryEscape(rawURL)
dubboPath = fmt.Sprintf("/dubbo/%s/%s", conf.Service, (DubboType(CONSUMER)).String()) dubboPath = fmt.Sprintf("/dubbo/%s/%s", conf.Service, (DubboType(CONSUMER)).String())
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment