automatic cleanup start and stop.

Author: m1k1o

hlsproxy/cache.go

@@ -20,7 +20,6 @@ func (m *ManagerCtx) getFromCache(key string) (*utils.Cache, bool) {
 
 	// if cache has expired
 	if time.Now().After(entry.Expires) {
-		m.removeFromCache(key)
 		return nil, false
 	}
 
@@ -50,25 +49,73 @@ func (m *ManagerCtx) saveToCache(key string, reader io.Reader, duration time.Dur
 		}
 	}()
 
-	return cache
-}
-
-func (m *ManagerCtx) removeFromCache(key string) {
-	m.cacheMu.Lock()
-	defer m.cacheMu.Unlock()
+	// start periodic cleanup if not running
+	m.cleanupStart()
 
-	delete(m.cache, key)
+	return cache
 }
 
 func (m *ManagerCtx) clearCache() {
-	m.cacheMu.Lock()
-	defer m.cacheMu.Unlock()
+	cacheSize := 0
 
-	// remove expired entries
+	m.cacheMu.Lock()
 	for key, entry := range m.cache {
+		// remove expired entries
 		if time.Now().After(entry.Expires) {
 			delete(m.cache, key)
 			m.logger.Debug().Str("key", key).Msg("cache cleanup remove expired")
+		} else {
+			cacheSize++
 		}
 	}
+	m.cacheMu.Unlock()
+
+	if cacheSize == 0 {
+		m.cleanupStop()
+	}
+}
+
+func (m *ManagerCtx) cleanupStart() {
+	m.cleanupMu.Lock()
+	defer m.cleanupMu.Unlock()
+
+	// if already running
+	if m.cleanup {
+		return
+	}
+
+	m.shutdown = make(chan struct{})
+	m.cleanup = true
+
+	go func() {
+		m.logger.Debug().Msg("cleanup started")
+
+		ticker := time.NewTicker(cacheCleanupPeriod)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-m.shutdown:
+				return
+			case <-ticker.C:
+				m.logger.Debug().Msg("performing cleanup")
+				m.clearCache()
+			}
+		}
+	}()
+}
+
+func (m *ManagerCtx) cleanupStop() {
+	m.cleanupMu.Lock()
+	defer m.cleanupMu.Unlock()
+
+	// if not running
+	if !m.cleanup {
+		return
+	}
+
+	m.cleanup = false
+	close(m.shutdown)
+
+	m.logger.Debug().Msg("cleanup stopped")
 }

hlsproxy/manager.go

@@ -23,14 +23,15 @@ const playlistExpiration = 1 * time.Second
 
 type ManagerCtx struct {
 	logger  zerolog.Logger
-	mu      sync.Mutex
 	baseUrl string
 	prefix  string
 
 	cache   map[string]*utils.Cache
 	cacheMu sync.RWMutex
 
-	shutdown chan struct{}
+	cleanup   bool
+	cleanupMu sync.RWMutex
+	shutdown  chan struct{}
 }
 
 func New(baseUrl string, prefix string) *ManagerCtx {
@@ -39,44 +40,15 @@ func New(baseUrl string, prefix string) *ManagerCtx {
 	baseUrl += "/"
 
 	return &ManagerCtx{
-		logger:   log.With().Str("module", "hlsproxy").Str("submodule", "manager").Logger(),
-		baseUrl:  baseUrl,
-		prefix:   prefix,
-		cache:    map[string]*utils.Cache{},
-		shutdown: make(chan struct{}),
+		logger:  log.With().Str("module", "hlsproxy").Str("submodule", "manager").Logger(),
+		baseUrl: baseUrl,
+		prefix:  prefix,
+		cache:   map[string]*utils.Cache{},
 	}
 }
 
-func (m *ManagerCtx) Start() error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	m.shutdown = make(chan struct{})
-
-	// periodic cleanup
-	go func() {
-		ticker := time.NewTicker(cacheCleanupPeriod)
-		defer ticker.Stop()
-
-		for {
-			select {
-			case <-m.shutdown:
-				return
-			case <-ticker.C:
-				m.logger.Debug().Msg("performing cleanup")
-				m.clearCache()
-			}
-		}
-	}()
-
-	return nil
-}
-
-func (m *ManagerCtx) Stop() {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	close(m.shutdown)
+func (m *ManagerCtx) Shutdown() {
+	m.cleanupStop()
 }
 
 func (m *ManagerCtx) ServePlaylist(w http.ResponseWriter, r *http.Request) {

hlsproxy/types.go

@@ -3,8 +3,7 @@ package hlsproxy
 import "net/http"
 
 type Manager interface {
-	Start() error
-	Stop()
+	Shutdown()
 
 	ServePlaylist(w http.ResponseWriter, r *http.Request)
 	ServeMedia(w http.ResponseWriter, r *http.Request)

internal/api/hlsproxy.go

@@ -28,8 +28,6 @@ func (a *ApiManagerCtx) HLSProxy(r chi.Router) {
 		if !ok {
 			// create new manager
 			manager = hlsproxy.New(baseUrl, hlsProxyPerfix+ID+"/")
-			manager.Start()
-
 			hlsProxyManagers[ID] = manager
 		}
 

internal/api/router.go

@@ -35,9 +35,9 @@ func (manager *ApiManagerCtx) Shutdown() error {
 		hls.Stop()
 	}
 
-	// stop all hls proxy managers
+	// shutdown all hls proxy managers
 	for _, hls := range hlsProxyManagers {
-		hls.Stop()
+		hls.Shutdown()
 	}
 
 	return nil