move syncing between handlign events into event manager & cleanup htt…

…p server
disgoorg · Apr 16, 2022 · 1563cca · 1563cca
1 parent ff86d8d
commit 1563cca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/bot/event_manager.go b/bot/event_manager.go
@@ -63,6 +63,8 @@ type eventManagerImpl struct {
 	client          Client
 	eventListenerMu sync.Mutex
 	config          EventManagerConfig
+
+	mu sync.Mutex
 }
 
 func (e *eventManagerImpl) RawEventsEnabled() bool {
@@ -71,6 +73,8 @@ func (e *eventManagerImpl) RawEventsEnabled() bool {
 
 // HandleGatewayEvent calls the correct core.EventHandler
 func (e *eventManagerImpl) HandleGatewayEvent(gatewayEventType discord.GatewayEventType, sequenceNumber int, reader io.Reader) {
+	e.mu.Lock()
+	defer e.mu.Unlock()
 	if handler, ok := e.config.GatewayHandlers[gatewayEventType]; ok {
 		v := handler.New()
 		if v != nil {
@@ -87,6 +91,8 @@ func (e *eventManagerImpl) HandleGatewayEvent(gatewayEventType discord.GatewayEv
 
 // HandleHTTPEvent calls the correct core.EventHandler
 func (e *eventManagerImpl) HandleHTTPEvent(respondFunc httpserver.RespondFunc, reader io.Reader) {
+	e.mu.Lock()
+	defer e.mu.Unlock()
 	v := e.config.HTTPServerHandler.New()
 	if err := json.NewDecoder(reader).Decode(&v); err != nil {
 		e.client.Logger().Error("error while unmarshalling httpserver event. error: ", err)

diff --git a/httpserver/server_impl.go b/httpserver/server_impl.go
@@ -29,22 +29,16 @@ func New(eventHandlerFunc EventHandlerFunc, opts ...ConfigOpt) Server {
 
 	return &serverImpl{
 		config:           *config,
-		eventHandlerFunc: eventHandlerFunc,
 		publicKey:        hexDecodedKey,
+		eventHandlerFunc: eventHandlerFunc,
 	}
 }
 
 // serverImpl is used in Client's webhook server for interactions
 type serverImpl struct {
 	config           Config
-	eventHandlerFunc EventHandlerFunc
 	publicKey        PublicKey
-	interactionCh    chan interaction
-}
-
-type interaction struct {
-	respondFunc RespondFunc
-	reader      io.Reader
+	eventHandlerFunc EventHandlerFunc
 }
 
 func (s *serverImpl) Logger() log.Logger {
@@ -57,17 +51,7 @@ func (s *serverImpl) PublicKey() PublicKey {
 }
 
 func (s *serverImpl) Handle(respondFunc RespondFunc, payload io.Reader) {
-	s.interactionCh <- interaction{
-		respondFunc: respondFunc,
-		reader:      payload,
-	}
-}
-
-func (s *serverImpl) listen() {
-	s.interactionCh = make(chan interaction)
-	for i := range s.interactionCh {
-		s.eventHandlerFunc(i.respondFunc, i.reader)
-	}
+	s.eventHandlerFunc(respondFunc, payload)
 }
 
 // Start makes the serverImpl listen on the specified port and handle requests
@@ -76,8 +60,6 @@ func (s *serverImpl) Start() {
 	s.config.HTTPServer.Addr = s.config.Address
 	s.config.HTTPServer.Handler = s.config.ServeMux
 
-	go s.listen()
-
 	go func() {
 		var err error
 		if s.config.CertFile != "" && s.config.KeyFile != "" {
@@ -86,15 +68,14 @@ func (s *serverImpl) Start() {
 			err = s.config.HTTPServer.ListenAndServe()
 		}
 		if err != nil && err != http.ErrServerClosed {
-			s.config.Logger.Error("error while running http server: ", err)
+			s.Logger().Error("error while running http server: ", err)
 		}
 	}()
 }
 
 // Close shuts down the serverImpl
 func (s *serverImpl) Close(ctx context.Context) {
 	_ = s.config.HTTPServer.Shutdown(ctx)
-	close(s.interactionCh)
 }
 
 type WebhookInteractionHandler struct {