From 37b2f2b8f5c872da404ff33c47da4e4e554e4501 Mon Sep 17 00:00:00 2001 From: CodingSinger <ooczzoo@gmail.com> Date: Mon, 6 Apr 2020 11:54:07 +0800 Subject: [PATCH] rm debug logs and fix ut --- registry/base_registry.go | 4 ---- registry/zookeeper/listener.go | 12 +++++------- registry/zookeeper/registry.go | 1 - remoting/zookeeper/client.go | 2 +- remoting/zookeeper/facade_test.go | 12 +++++++++++- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/registry/base_registry.go b/registry/base_registry.go index 8e13a522c..3e1bddf23 100644 --- a/registry/base_registry.go +++ b/registry/base_registry.go @@ -117,14 +117,10 @@ func (r *BaseRegistry) GetUrl() common.URL { func (r *BaseRegistry) Destroy() { //first step close registry's all listeners r.facadeBasedRegistry.CloseListener() - logger.Info("1---") // then close r.done to notify other program who listen to it close(r.done) - logger.Info("2---") - // wait waitgroup done (wait listeners outside close over) r.wg.Wait() - logger.Info("3---") //close registry client r.closeRegisters() diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go index 63c8d37a4..c5b2f33c6 100644 --- a/registry/zookeeper/listener.go +++ b/registry/zookeeper/listener.go @@ -93,7 +93,6 @@ func (l *RegistryDataListener) DataChange(eventType remoting.Event) bool { // Close all RegistryConfigurationListener in subscribed func (l *RegistryDataListener) Close() { l.mutex.Lock() - logger.Info("Close all reg") defer l.mutex.Unlock() for _, listener := range l.subscribed { listener.(*RegistryConfigurationListener).Close() @@ -126,14 +125,13 @@ func (l *RegistryConfigurationListener) Next() (*registry.ServiceEvent, error) { for { select { case <-l.client.Done(): - logger.Warnf("listener's zk client connection is broken, so zk event listener exit now.") - return nil, perrors.New("listener stopped") - + logger.Warnf("listener's zk client connection (address {%s}) is broken, so zk event listener exit now.", l.client.ZkAddrs) + return nil, perrors.New("zookeeper client stopped") case <-l.close: - return nil, perrors.New("listener closed") + return nil, perrors.New("listener have been closed") case <-l.registry.Done(): - logger.Warnf("zk consumer register has quit, so zk event listener exit now.") - return nil, perrors.New("listener stopped") + logger.Warnf("zk consumer register has quit, so zk event listener exit now. (registry url {%v}", l.registry.BaseRegistry.URL) + return nil, perrors.New("zookeeper registry, (registry url{%v}) stopped") case e := <-l.events: logger.Debugf("got zk event %s", e) if e.ConfigType == remoting.EventTypeDel && !l.valid() { diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index 3ab841b89..88d5d6221 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -154,7 +154,6 @@ func (r *zkRegistry) DoSubscribe(conf *common.URL) (registry.Listener, error) { } func (r *zkRegistry) CloseAndNilClient() { - logger.Info("c") r.client.Close() r.client = nil } diff --git a/remoting/zookeeper/client.go b/remoting/zookeeper/client.go index 39812841d..c788bc4c1 100644 --- a/remoting/zookeeper/client.go +++ b/remoting/zookeeper/client.go @@ -157,7 +157,7 @@ func ValidateZookeeperClient(container zkClientFacade, opts ...Option) error { } if connected { - logger.Info("sdsds") + logger.Info("Connect to zookeeper successfully, name{%s}, zk address{%v}", opions.zkName, url.Location) container.WaitGroup().Add(1) //zk client start successful, then registry wg +1 } diff --git a/remoting/zookeeper/facade_test.go b/remoting/zookeeper/facade_test.go index a41f6cd32..01d46da6c 100644 --- a/remoting/zookeeper/facade_test.go +++ b/remoting/zookeeper/facade_test.go @@ -38,6 +38,16 @@ type mockFacade struct { done chan struct{} } +func newMockFacade(client *ZookeeperClient, url *common.URL) zkClientFacade { + mock := &mockFacade{ + client: client, + URL: url, + } + + mock.wg.Add(1) + return mock +} + func (r *mockFacade) ZkClient() *ZookeeperClient { return r.client } @@ -80,7 +90,7 @@ func Test_Facade(t *testing.T) { assert.NoError(t, err) defer ts.Stop() url, _ := common.NewURL("mock://127.0.0.1") - mock := &mockFacade{client: z, URL: &url} + mock := newMockFacade(z, &url) go HandleClientRestart(mock) states := []zk.State{zk.StateConnecting, zk.StateConnected, zk.StateHasSession} verifyEventStateOrder(t, event, states, "event channel") -- GitLab