From 5dd2bd0d3106567b454e43910bdf244f0f6fb5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=BE=9B=E6=A0=BC?= <xg.gao@tianrang-inc.com>
Date: Fri, 23 Aug 2019 23:20:49 +0800
Subject: [PATCH] modify yaml
---
examples/consul/go-client/config/client.yml | 16 +++++-----------
examples/consul/go-server/config/server.yml | 8 +-------
registry/consul/listener.go | 4 ++--
3 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/examples/consul/go-client/config/client.yml b/examples/consul/go-client/config/client.yml
index ad5747204..8a7458c38 100644
--- a/examples/consul/go-client/config/client.yml
+++ b/examples/consul/go-client/config/client.yml
@@ -1,13 +1,3 @@
-# dubbo client yaml configure file
-
-
-check: true
-# client
-request_timeout : "3s"
-# connect timeout
-connect_timeout : "3s"
-
-# application config
application_config:
organization : "ikurento.com"
name : "BDTService"
@@ -17,7 +7,7 @@ application_config:
environment : "test"
registries :
- "hangzhouzk":
+ "consul":
protocol: "consul"
timeout : "3s"
address: "127.0.0.1:8500"
@@ -56,3 +46,7 @@ protocol_conf:
wait_timeout: "1s"
max_msg_len: 10240
session_name: "client"
+
+check: true
+request_timeout : "3s"
+connect_timeout : "3s"
diff --git a/examples/consul/go-server/config/server.yml b/examples/consul/go-server/config/server.yml
index dfefb3093..c12800e68 100644
--- a/examples/consul/go-server/config/server.yml
+++ b/examples/consul/go-server/config/server.yml
@@ -1,7 +1,3 @@
-# dubbo server yaml configure file
-
-
-# application config
application_config:
organization : "ikurento.com"
name : "BDTService"
@@ -11,7 +7,7 @@ application_config:
environment : "test"
registries :
- "hangzhouzk":
+ "consul":
protocol: "consul"
timeout : "3s"
address: "127.0.0.1:8500"
@@ -33,10 +29,8 @@ services:
protocols:
"dubbo1":
name: "dubbo"
- # ip : "127.0.0.1"
port: 20000
-
protocol_conf:
dubbo:
session_number: 700
diff --git a/registry/consul/listener.go b/registry/consul/listener.go
index 98cd8b3bd..b047a4c08 100644
--- a/registry/consul/listener.go
+++ b/registry/consul/listener.go
@@ -94,8 +94,8 @@ func newConsulListener(registryUrl common.URL, consumerUrl common.URL) (*consulL
consumerUrl: consumerUrl,
plan: plan,
urls: make([]common.URL, 0, 8),
- eventCh: make(chan *registry.ServiceEvent),
- errCh: make(chan error),
+ eventCh: make(chan *registry.ServiceEvent, 32),
+ errCh: make(chan error, 32),
done: make(chan struct{}),
}
--
GitLab