chan skip for blocking routine

led0nk · Jun 10, 2024 · 4ff7459 · 4ff7459
1 parent 607b157
commit 4ff7459
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 11 deletions.
diff --git a/internal/observer/observer.go b/internal/observer/observer.go
@@ -116,7 +116,10 @@ func (o *Observer) dataScraper(ctx context.Context, target *model.Server) chan *
 				}
 				replaceNullCharsInStruct(server)
 				server = correctPlayerNum(server)
-				out <- server
+				select {
+				case out <- server:
+				default:
+				}
 			}
 		}
 	}()
@@ -136,22 +139,22 @@ func (o *Observer) scanner(ctx context.Context, in chan *model.Server) chan *mod
 				if !ok {
 					return
 				}
-
 				blacklist := o.blacklist.List(ctx)
-
 				if server.PlayersInfo == nil {
 					continue
 				}
-
-				previousPlayers = o.scan(ctx, blacklist, server, previousPlayers)
-				out <- server
+				previousPlayers = o.scan(blacklist, server, previousPlayers)
+				select {
+				case out <- server:
+				default:
+				}
 			}
 		}
 	}()
 	return out
 }
 
-func (o *Observer) scan(ctx context.Context, blacklist []*model.BlacklistPlayers, server *model.Server, previousPlayers map[string]*NotificationStatus) map[string]*NotificationStatus {
+func (o *Observer) scan(blacklist []*model.BlacklistPlayers, server *model.Server, previousPlayers map[string]*NotificationStatus) map[string]*NotificationStatus {
 
 	blacklistMap := make(map[string]bool)
 	for _, blacklistedPlayer := range blacklist {

diff --git a/internal/server/handler.go b/internal/server/handler.go
@@ -112,8 +112,14 @@ func (s *Server) sseServerUpdate(w http.ResponseWriter, r *http.Request) {
 					status = `<span class="inline-flex items-center gap-1 rounded-full dark:bg-[#0D1117] bg-red-50 px-2 py-1 text-xs font-semibold text-red-600"><span class="h-1.5 w-1.5 rounded-full bg-red-600"></span>offline</span>`
 				}
 				playerInfo := strconv.Itoa(srv.ServerInfo.Players) + "/" + strconv.Itoa(srv.ServerInfo.MaxPlayers)
-				dataCh <- event{Type: "PlayerCounter", Data: playerInfo}
-				dataCh <- event{Type: "ServerStatus", Data: status}
+				select {
+				case dataCh <- event{Type: "PlayerCounter", Data: playerInfo}:
+				default:
+				}
+				select {
+				case dataCh <- event{Type: "ServerStatus", Data: status}:
+				default:
+				}
 				time.Sleep(5 * time.Second)
 			}
 		}

diff --git a/internal/services/discord/discord_test.go b/internal/services/discord/discord_test.go
@@ -0,0 +1,49 @@
+package discord
+
+//TODO: setup mock server for discord
+
+//func TestDiscordMessages(t *testing.T) {
+//	ctx := context.Background()
+//
+//	tests := []struct {
+//		name      string
+//		token     string
+//		channelID string
+//		expectErr bool
+//	}{
+//		{
+//			name:      "valid token and channelID",
+//			token:     "dummy-token",
+//			channelID: "dummy-channelID",
+//			expectErr: false,
+//		},
+//		{
+//			name:      "invalid token",
+//			token:     "invalid-token",
+//			channelID: "dummy-channelID",
+//			expectErr: true,
+//		},
+//		{
+//			name:      "invalid channelID",
+//			token:     "dummy-token",
+//			channelID: "invalid-channelID",
+//			expectErr: true,
+//		},
+//	}
+//
+//	for _, tt := range tests {
+//		t.Run(tt.name, func(t *testing.T) {
+//			testDC, err := NewDiscordNotifier(ctx, tt.token, tt.channelID)
+//			if tt.expectErr {
+//				assert.Error(t, err)
+//			}
+//			if testDC != nil {
+//				err = testDC.Connect(ctx)
+//				if tt.expectErr {
+//					assert.Error(t, err)
+//				}
+//			}
+//			assert.NoError(t, err)
+//		})
+//	}
+//}
diff --git a/pkg/events/event.go b/pkg/events/event.go
@@ -61,8 +61,11 @@ func (e *EventManager) Publish(emsg EventMessage) {
 	e.mu.Lock()
 	defer e.mu.Unlock()
 	for subscriber, ch := range e.subscriber {
-		e.logger.Debug("publish eventMessage", "debug", "publish", subscriber.String(), fmt.Sprintf("%s", emsg))
-		ch <- emsg
+		select {
+		case ch <- emsg:
+			e.logger.Debug("publish eventMessage", "debug", "publish", subscriber.String(), fmt.Sprintf("%s", emsg))
+		default:
+		}
 	}
 }