This is an automated email from the ASF dual-hosted git repository.
laurence pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 8f94478 fix: add chan zk waiter
8f94478 is described below
commit 8f944786b97e75d784fd93a492005b3874394a50
Author: LaurenceLiZhixin <[email protected]>
AuthorDate: Sun Jul 18 00:19:26 2021 +0800
fix: add chan zk waiter
---
chain/build/test.sh | 2 ++
general/dubbo/go-client/cmd/client.go | 2 +-
general/dubbo/go-server/cmd/server.go | 4 ----
general/dubbo3/codec-extension/go-server/cmd/server.go | 2 +-
general/dubbo3/codec-extension/go-server/pkg/greeter.go | 2 +-
general/dubbo3/hessian2/go-client/cmd/client.go | 2 +-
general/dubbo3/msgpack/go-server/cmd/server.go | 2 +-
general/dubbo3/msgpack/go-server/pkg/greeter.go | 2 +-
.../tests/integration/grpc_test_proto/helloworld.pb.go | 1 -
general/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go | 1 -
general/jsonrpc/go-client/cmd/client.go | 6 +++---
tracing/grpc/go-server/app/helloworld.pb.go | 2 --
12 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/chain/build/test.sh b/chain/build/test.sh
index 8cff497..dae7432 100755
--- a/chain/build/test.sh
+++ b/chain/build/test.sh
@@ -20,6 +20,8 @@ P_DIR="$1"
# start zookeeper
make PROJECT_DIR="$P_DIR" PROJECT_NAME="$(basename "$P_DIR")"
BASE_DIR="$P_DIR"/dist -f build/Makefile docker-up
+make PROJECT_DIR="$P_DIR" PROJECT_NAME="$(basename "$P_DIR")"
BASE_DIR="$P_DIR"/dist -f build/Makefile docker-health-check
+
# start server
make PROJECT_DIR="$P_DIR"/backend PROJECT_NAME="$(basename "$P_DIR"/backend)"
BASE_DIR="$P_DIR"/backend/dist -f build/Makefile start
make PROJECT_DIR="$P_DIR"/middle PROJECT_NAME="$(basename "$P_DIR"/middle)"
CONF_CONSUMER_FILE_PATH="$P_DIR"/middle/conf/client.yml
BASE_DIR="$P_DIR"/middle/dist -f build/Makefile start
diff --git a/general/dubbo/go-client/cmd/client.go
b/general/dubbo/go-client/cmd/client.go
index 0c2ba3e..5cdcdf8 100644
--- a/general/dubbo/go-client/cmd/client.go
+++ b/general/dubbo/go-client/cmd/client.go
@@ -42,7 +42,7 @@ import (
)
var (
- userProvider = new(pkg.UserProvider)
+ userProvider = new(pkg.UserProvider)
)
// need to setup environment variable "CONF_CONSUMER_FILE_PATH" to
"conf/client.yml" before run
diff --git a/general/dubbo/go-server/cmd/server.go
b/general/dubbo/go-server/cmd/server.go
index 48cab4e..32a7a0e 100644
--- a/general/dubbo/go-server/cmd/server.go
+++ b/general/dubbo/go-server/cmd/server.go
@@ -27,15 +27,11 @@ import (
import (
_ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl"
- _ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl"
- _ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance"
_ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance"
"dubbo.apache.org/dubbo-go/v3/common/logger"
_ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory"
- _ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory"
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/filter/filter_impl"
- _ "dubbo.apache.org/dubbo-go/v3/filter/filter_impl"
_ "dubbo.apache.org/dubbo-go/v3/metadata/service/local"
_ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo"
_ "dubbo.apache.org/dubbo-go/v3/registry/protocol"
diff --git a/general/dubbo3/codec-extension/go-server/cmd/server.go
b/general/dubbo3/codec-extension/go-server/cmd/server.go
index 55da7c0..27d439d 100644
--- a/general/dubbo3/codec-extension/go-server/cmd/server.go
+++ b/general/dubbo3/codec-extension/go-server/cmd/server.go
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
-*/
+ */
package main
diff --git a/general/dubbo3/codec-extension/go-server/pkg/greeter.go
b/general/dubbo3/codec-extension/go-server/pkg/greeter.go
index c627552..52d08fd 100644
--- a/general/dubbo3/codec-extension/go-server/pkg/greeter.go
+++ b/general/dubbo3/codec-extension/go-server/pkg/greeter.go
@@ -34,7 +34,7 @@ type User struct {
type UserProvider struct {
}
-func (u *UserProvider) GetUser(ctx context.Context,user *User) (*User, error) {
+func (u *UserProvider) GetUser(ctx context.Context, user *User) (*User, error)
{
gxlog.CInfo("req:%#v", user)
rsp := User{"12345", "Hello " + user.Name, 18}
gxlog.CInfo("rsp:%#v", rsp)
diff --git a/general/dubbo3/hessian2/go-client/cmd/client.go
b/general/dubbo3/hessian2/go-client/cmd/client.go
index d065c13..8e664c3 100644
--- a/general/dubbo3/hessian2/go-client/cmd/client.go
+++ b/general/dubbo3/hessian2/go-client/cmd/client.go
@@ -58,7 +58,7 @@ func main() {
gxlog.CInfo("\n\n\nstart to test dubbo")
user := &pkg.User{}
- err := userProvider.GetUser(context.TODO(), &pkg.User{Name: "laurence"}
,user)
+ err := userProvider.GetUser(context.TODO(), &pkg.User{Name:
"laurence"}, user)
if err != nil {
gxlog.CError("error: %v\n", err)
os.Exit(1)
diff --git a/general/dubbo3/msgpack/go-server/cmd/server.go
b/general/dubbo3/msgpack/go-server/cmd/server.go
index 6f0d2c8..0664d29 100644
--- a/general/dubbo3/msgpack/go-server/cmd/server.go
+++ b/general/dubbo3/msgpack/go-server/cmd/server.go
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
-*/
+ */
package main
diff --git a/general/dubbo3/msgpack/go-server/pkg/greeter.go
b/general/dubbo3/msgpack/go-server/pkg/greeter.go
index ecb2ead..3283212 100644
--- a/general/dubbo3/msgpack/go-server/pkg/greeter.go
+++ b/general/dubbo3/msgpack/go-server/pkg/greeter.go
@@ -34,7 +34,7 @@ type User struct {
type UserProvider struct {
}
-func (u UserProvider) GetUser(ctx context.Context,user *User) (*User, error) {
+func (u UserProvider) GetUser(ctx context.Context, user *User) (*User, error) {
gxlog.CInfo("req:%#v", user)
rsp := User{"12345", "Hello " + user.Name, 18}
gxlog.CInfo("rsp:%#v", rsp)
diff --git
a/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/tests/integration/grpc_test_proto/helloworld.pb.go
b/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/tests/integration/grpc_test_proto/helloworld.pb.go
index 53aa967..ef09f0a 100644
---
a/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/tests/integration/grpc_test_proto/helloworld.pb.go
+++
b/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/tests/integration/grpc_test_proto/helloworld.pb.go
@@ -130,7 +130,6 @@ func (m *User) GetAge() int32 {
return 0
}
-
var fileDescriptor_17b8c58d586b62f2 = []byte{
// 178 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12,
0xc8, 0x48, 0xcd, 0xc9,
diff --git a/general/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go
b/general/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go
index 66fd394..87f308b 100644
--- a/general/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go
+++ b/general/dubbo3/pb/dubbogo-grpc/server/grpcgo-server/main.go
@@ -27,7 +27,6 @@ import (
"github.com/dubbogo/net/context"
"google.golang.org/grpc"
- "google.golang.org/grpc"
"google.golang.org/grpc/reflection"
"google.golang.org/grpc/reflection"
diff --git a/general/jsonrpc/go-client/cmd/client.go
b/general/jsonrpc/go-client/cmd/client.go
index 18be592..9f8b6e1 100644
--- a/general/jsonrpc/go-client/cmd/client.go
+++ b/general/jsonrpc/go-client/cmd/client.go
@@ -46,9 +46,9 @@ import (
var (
survivalTimeout int = 10e9
- userProvider = new(pkg.UserProvider)
- userProvider1 = new(pkg.UserProvider1)
- userProvider2 = new(pkg.UserProvider2)
+ userProvider = new(pkg.UserProvider)
+ userProvider1 = new(pkg.UserProvider1)
+ userProvider2 = new(pkg.UserProvider2)
)
func init() {
diff --git a/tracing/grpc/go-server/app/helloworld.pb.go
b/tracing/grpc/go-server/app/helloworld.pb.go
index 9523661..43c9335 100644
--- a/tracing/grpc/go-server/app/helloworld.pb.go
+++ b/tracing/grpc/go-server/app/helloworld.pb.go
@@ -17,8 +17,6 @@ import (
"github.com/golang/protobuf/proto"
"google.golang.org/grpc"
- "google.golang.org/grpc"
- "google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
