Refactor to include new CacheAge (#22)

Co-authored-by: Chris Gibson <cgibson@datto.com>
equalsgibson · Oct 19, 2023 · 807d4ee · 807d4ee
1 parent 942c307
commit 807d4ee
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/five9/internal/utils/utils.go b/five9/internal/utils/utils.go
@@ -111,3 +111,13 @@ func (cache *MemoryCacheInstance[Key, T]) GetLastUpdated() *time.Time {
 
 	return cache.lastUpdated
 }
+
+func (cache *MemoryCacheInstance[Key, T]) GetCacheAge() *time.Duration {
+	cache.mutex.Lock()
+	defer cache.mutex.Unlock()
+	if cache.lastUpdated != nil {
+		age := time.Since(*cache.lastUpdated)
+		return &age
+	}
+	return nil
+}
diff --git a/five9/supervisor.go b/five9/supervisor.go
@@ -16,8 +16,10 @@ type SupervisorService struct {
 }
 
 func (s *SupervisorService) getDomainUserInfoMap(ctx context.Context) (map[five9types.UserID]five9types.AgentInfo, error) {
-	if s.domainMetadataCache.agentInfoState.GetLastUpdated() != nil {
-		if time.Since(*s.domainMetadataCache.agentInfoState.GetLastUpdated()) < time.Hour {
+	timeLastUpdated := s.domainMetadataCache.agentInfoState.GetCacheAge()
+
+	if timeLastUpdated != nil {
+		if *timeLastUpdated < time.Hour {
 			return s.domainMetadataCache.agentInfoState.GetAll().Items, nil
 		}
 	}

diff --git a/five9/supervisor_websocket.go b/five9/supervisor_websocket.go
@@ -162,6 +162,7 @@ func (s *SupervisorService) read(ctx context.Context) error {
 func (s *SupervisorService) resetCache() {
 	s.webSocketCache.agentState.Reset()
 	s.webSocketCache.timers.Reset()
+	s.domainMetadataCache.agentInfoState.Reset()
 
 	serviceReset := time.Now()
 	s.webSocketCache.timers.Update(five9types.EventIDPongReceived, &serviceReset)

diff --git a/five9/supervisor_websocket_handler.go b/five9/supervisor_websocket_handler.go
@@ -33,6 +33,8 @@ func (s *SupervisorService) handleWebsocketMessage(messageBytes []byte) error {
 			MessageBytes:  messageBytes,
 		}
 	}
+	eventReceivedTime := time.Now()
+	s.webSocketCache.timers.Update(message.Context.EventID, &eventReceivedTime)
 
 	switch message.Context.EventID {
 	case five9types.EventIDServerConnected:
@@ -58,10 +60,6 @@ func (s *SupervisorService) handlerPong(payload any) error {
 		return fmt.Errorf("payload not expected type")
 	}
 
-	pongReceived := time.Now()
-
-	s.webSocketCache.timers.Update(five9types.EventIDPongReceived, &pongReceived)
-
 	return nil
 }
 
@@ -164,9 +162,6 @@ func (s *SupervisorService) handlerSupervisorStats(payload any) error {
 		}
 	}
 
-	statisticsReceivedTime := time.Now()
-	s.webSocketCache.timers.Update(five9types.EventIDSupervisorStats, &statisticsReceivedTime)
-
 	return nil
 }
 
@@ -183,8 +178,5 @@ func (s *SupervisorService) handleAgentStateUpdate(eventData five9types.WebSocke
 		s.webSocketCache.agentState.Delete(removedData.ID)
 	}
 
-	incrementalUpdateComplete := time.Now()
-	s.webSocketCache.timers.Update(five9types.EventIDIncrementalStatsUpdate, &incrementalUpdateComplete)
-
 	return nil
 }