minor style fixes

centrifugal · Jun 12, 2020 · c35c7b0 · c35c7b0
1 parent e89a6aa
commit c35c7b0
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 31 deletions.
diff --git a/_examples/chat_json/main.go b/_examples/chat_json/main.go
@@ -42,11 +42,11 @@ func authMiddleware(h http.Handler) http.Handler {
 }
 
 func waitExitSignal(n *centrifuge.Node) {
-	sigs := make(chan os.Signal, 1)
+	sigCh := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		<-sigs
+		<-sigCh
 		n.Shutdown(context.Background())
 		done <- true
 	}()
@@ -126,7 +126,6 @@ func main() {
 
 		client.On().SubRefresh(func(e centrifuge.SubRefreshEvent) centrifuge.SubRefreshReply {
 			log.Printf("user %s subscription on channel %s is going to expire, refreshing", client.UserID(), e.Channel)
-			client.Close(centrifuge.DisconnectForceReconnect)
 			return centrifuge.SubRefreshReply{
 				ExpireAt: time.Now().Unix() + 60,
 			}

diff --git a/_examples/chat_protobuf/main.go b/_examples/chat_protobuf/main.go
@@ -34,11 +34,11 @@ func authMiddleware(h http.Handler) http.Handler {
 }
 
 func waitExitSignal(n *centrifuge.Node) {
-	sigs := make(chan os.Signal, 1)
+	sigCh := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		<-sigs
+		<-sigCh
 		n.Shutdown(context.Background())
 		done <- true
 	}()

diff --git a/_examples/connecting_handler/main.go b/_examples/connecting_handler/main.go
@@ -14,11 +14,11 @@ import (
 )
 
 func waitExitSignal(n *centrifuge.Node) {
-	sigs := make(chan os.Signal, 1)
+	sigCh := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		<-sigs
+		<-sigCh
 		n.Shutdown(context.Background())
 		done <- true
 	}()

diff --git a/_examples/custom_broker/main.go b/_examples/custom_broker/main.go
@@ -38,11 +38,11 @@ func authMiddleware(h http.Handler) http.Handler {
 }
 
 func waitExitSignal(n *centrifuge.Node) {
-	sigs := make(chan os.Signal, 1)
+	sigCh := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		<-sigs
+		<-sigCh
 		n.Shutdown(context.Background())
 		done <- true
 	}()

diff --git a/_examples/custom_ws_gobwas/main.go b/_examples/custom_ws_gobwas/main.go
@@ -32,11 +32,11 @@ func handleLog(e centrifuge.LogEntry) {
 }
 
 func waitExitSignal(n *centrifuge.Node) {
-	sigs := make(chan os.Signal, 1)
+	sigCh := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		<-sigs
+		<-sigCh
 		n.Shutdown(context.Background())
 		done <- true
 	}()

diff --git a/_examples/custom_ws_nhooyr/main.go b/_examples/custom_ws_nhooyr/main.go
@@ -42,11 +42,11 @@ func authMiddleware(h http.Handler) http.Handler {
 }
 
 func waitExitSignal(n *centrifuge.Node) {
-	sigs := make(chan os.Signal, 1)
+	sigCh := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		<-sigs
+		<-sigCh
 		n.Shutdown(context.Background())
 		done <- true
 	}()

diff --git a/_examples/redis_engine/main.go b/_examples/redis_engine/main.go
@@ -38,11 +38,11 @@ func authMiddleware(h http.Handler) http.Handler {
 }
 
 func waitExitSignal(n *centrifuge.Node) {
-	sigs := make(chan os.Signal, 1)
+	sigCh := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		<-sigs
+		<-sigCh
 		n.Shutdown(context.Background())
 		done <- true
 	}()

diff --git a/_examples/testsuite/main.go b/_examples/testsuite/main.go
@@ -204,11 +204,11 @@ func main() {
 	go RegisterTestCase(ctx, 10003, testReceiveRPCReceiveMessageJSON, "testReceiveRPCReceiveMessageJSON", true)
 	go RegisterTestCase(ctx, 10004, testReceiveRPCReceiveMessageProtobuf, "testReceiveRPCReceiveMessageProtobuf", true)
 
-	sigs := make(chan os.Signal, 1)
+	sigCh := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		<-sigs
+		<-sigCh
 		log.Println("Interrupted")
 		cancel()
 		done <- true

diff --git a/_examples/worms/main.go b/_examples/worms/main.go
@@ -35,11 +35,11 @@ func authMiddleware(h http.Handler) http.Handler {
 }
 
 func waitExitSignal(n *centrifuge.Node) {
-	sigs := make(chan os.Signal, 1)
+	sigCh := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		<-sigs
+		<-sigCh
 		n.Shutdown(context.Background())
 		done <- true
 	}()

diff --git a/client.go b/client.go
@@ -386,7 +386,6 @@ func (c *Client) updatePresence() {
 	c.mu.Lock()
 	c.addPresenceUpdate()
 	c.mu.Unlock()
-	return
 }
 
 func (c *Client) checkPosition(checkDelay time.Duration, ch string, channelContext ChannelContext) bool {
@@ -852,7 +851,6 @@ func (c *Client) expire() {
 	}
 
 	_ = c.close(DisconnectExpired)
-	return
 }
 
 func (c *Client) handleConnect(params protocol.Raw, rw *replyWriter) *Disconnect {

diff --git a/internal/dissolve/dissolve_test.go b/internal/dissolve/dissolve_test.go
@@ -14,6 +14,7 @@ func TestDissolver(t *testing.T) {
 	ch := make(chan struct{})
 	numJobs := 1024
 	var wg sync.WaitGroup
+	errCh := make(chan error, 1)
 	wg.Add(numJobs)
 	go func() {
 		for i := 0; i < numJobs; i++ {
@@ -22,7 +23,7 @@ func TestDissolver(t *testing.T) {
 				return nil
 			})
 			if err != nil {
-				t.Fatalf("Submit returned error: %v", err)
+				errCh <- err
 			}
 		}
 	}()
@@ -35,6 +36,11 @@ func TestDissolver(t *testing.T) {
 	case <-time.After(time.Second):
 		t.Fatal("timeout")
 	}
+	select {
+	case err := <-errCh:
+		t.Fatalf("Submit returned error: %v", err)
+	default:
+	}
 }
 
 func TestDissolverErrorHandling(t *testing.T) {