From 3395787f5e25897ef5fea0f7e14950fc23591440 Mon Sep 17 00:00:00 2001
From: AlexStocks <alexstocks@foxmail.com>
Date: Wed, 14 Aug 2019 18:28:50 +0800
Subject: [PATCH] Imp: constant -> version in log
---
cluster/cluster_impl/base_cluster_invoker.go | 4 ++--
cluster/cluster_impl/failover_cluster_invoker.go | 2 +-
config/config_loader.go | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go
index 5bcadee28..52e215688 100644
--- a/cluster/cluster_impl/base_cluster_invoker.go
+++ b/cluster/cluster_impl/base_cluster_invoker.go
@@ -65,7 +65,7 @@ func (invoker *baseClusterInvoker) checkInvokers(invokers []protocol.Invoker, in
if len(invokers) == 0 {
ip, _ := utils.GetLocalIP()
return perrors.Errorf("Failed to invoke the method %v. No provider available for the service %v from "+
- "registry %v on the consumer %v using the dubbo constant %v .Please check if the providers have been started and registered.",
+ "registry %v on the consumer %v using the dubbo version %v .Please check if the providers have been started and registered.",
invocation.MethodName(), invoker.directory.GetUrl().SubURL.Key(), invoker.directory.GetUrl().String(), ip, constant.Version)
}
return nil
@@ -76,7 +76,7 @@ func (invoker *baseClusterInvoker) checkInvokers(invokers []protocol.Invoker, in
func (invoker *baseClusterInvoker) checkWhetherDestroyed() error {
if invoker.destroyed.Load() {
ip, _ := utils.GetLocalIP()
- return perrors.Errorf("Rpc cluster invoker for %v on consumer %v use dubbo constant %v is now destroyed! can not invoke any more. ",
+ return perrors.Errorf("Rpc cluster invoker for %v on consumer %v use dubbo version %v is now destroyed! can not invoke any more. ",
invoker.directory.GetUrl().Service(), ip, constant.Version)
}
return nil
diff --git a/cluster/cluster_impl/failover_cluster_invoker.go b/cluster/cluster_impl/failover_cluster_invoker.go
index b29acbf11..3dd8c41df 100644
--- a/cluster/cluster_impl/failover_cluster_invoker.go
+++ b/cluster/cluster_impl/failover_cluster_invoker.go
@@ -90,6 +90,6 @@ func (invoker *failoverClusterInvoker) Invoke(invocation protocol.Invocation) pr
ip, _ := utils.GetLocalIP()
return &protocol.RPCResult{Err: perrors.Errorf("Failed to invoke the method %v in the service %v. Tried %v times of "+
"the providers %v (%v/%v)from the registry %v on the consumer %v using the dubbo version %v. Last error is %v.",
- methodName, invoker.GetUrl().Service(), retries, providers, len(providers), len(invokers), invoker.directory.GetUrl(), ip, version.Version, result.Error().Error(),
+ methodName, invoker.GetUrl().Service(), retries, providers, len(providers), len(invokers), invoker.directory.GetUrl(), ip, constant.Version, result.Error().Error(),
)}
}
diff --git a/config/config_loader.go b/config/config_loader.go
index cabf3d1ed..b033aced5 100644
--- a/config/config_loader.go
+++ b/config/config_loader.go
@@ -93,7 +93,7 @@ func Load() {
checkok = false
count++
if count > maxWait {
- panic(fmt.Sprintf("Failed to check the status of the service %v . No provider available for the service to the consumer use dubbo constant %v", refconfig.InterfaceName, constant.Version))
+ panic(fmt.Sprintf("Failed to check the status of the service %v . No provider available for the service to the consumer use dubbo version %v", refconfig.InterfaceName, constant.Version))
}
time.Sleep(time.Second * 1)
break
--
GitLab