From 2760c722c41b6abba1442f197735a32cfb84462a Mon Sep 17 00:00:00 2001 From: kevin96666 Date: Thu, 13 Feb 2020 12:24:24 +0100 Subject: [PATCH 1/2] SubscribeHandler not working with NonVerbose mode --- recws.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/recws.go b/recws.go index 9124ff1..3884f71 100644 --- a/recws.go +++ b/recws.go @@ -404,25 +404,27 @@ func (rc *RecConn) connect() { rc.httpResp = httpResp rc.mu.Unlock() + if err == nil { if !rc.getNonVerbose() { log.Printf("Dial: connection was successfully established with %s\n", rc.url) + } - if !rc.hasSubscribeHandler() { - return - } - + if rc.hasSubscribeHandler() { if err := rc.SubscribeHandler(); err != nil { - log.Fatalf("Dial: connect handler failed with %s", err.Error()) + if !rc.getNonVerbose() { + log.Fatalf("Dial: connect handler failed with %s", err.Error()) + } } - - log.Printf("Dial: connect handler was successfully established with %s\n", rc.url) - - if rc.getKeepAliveTimeout() != 0 { - rc.keepAlive() + if !rc.getNonVerbose() { + log.Printf("Dial: connect handler was successfully established with %s\n", rc.url) } } + if rc.getKeepAliveTimeout() != 0 { + rc.keepAlive() + } + return } From 32d63751375f80ef2fa05e6e4bea2a38f40e31df Mon Sep 17 00:00:00 2001 From: kevin96666 Date: Thu, 13 Feb 2020 20:22:48 +0100 Subject: [PATCH 2/2] (fix) remove extra space + change log.Fatalf behavior vs test on SubscribeHandler --- recws.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/recws.go b/recws.go index 3884f71..1d4b27a 100644 --- a/recws.go +++ b/recws.go @@ -404,7 +404,6 @@ func (rc *RecConn) connect() { rc.httpResp = httpResp rc.mu.Unlock() - if err == nil { if !rc.getNonVerbose() { log.Printf("Dial: connection was successfully established with %s\n", rc.url) @@ -412,9 +411,7 @@ func (rc *RecConn) connect() { if rc.hasSubscribeHandler() { if err := rc.SubscribeHandler(); err != nil { - if !rc.getNonVerbose() { - log.Fatalf("Dial: connect handler failed with %s", err.Error()) - } + log.Fatalf("Dial: connect handler failed with %s", err.Error()) } if !rc.getNonVerbose() { log.Printf("Dial: connect handler was successfully established with %s\n", rc.url)