support switching back to regexp path configuration

Author: aler9

internal/core/path_manager.go

@@ -19,6 +19,9 @@ import (
 func pathConfCanBeUpdated(oldPathConf *conf.Path, newPathConf *conf.Path) bool {
 	clone := oldPathConf.Clone()
 
+	clone.Name = newPathConf.Name
+	clone.Regexp = newPathConf.Regexp
+
 	clone.Record = newPathConf.Record
 
 	clone.RPICameraBrightness = newPathConf.RPICameraBrightness
@@ -38,11 +41,6 @@ func pathConfCanBeUpdated(oldPathConf *conf.Path, newPathConf *conf.Path) bool {
 	clone.RPICameraIDRPeriod = newPathConf.RPICameraIDRPeriod
 	clone.RPICameraBitrate = newPathConf.RPICameraBitrate
 
-	if oldPathConf.Name == "all" || oldPathConf.Name == "all_others" {
-		clone.Name = newPathConf.Name
-		clone.Regexp = newPathConf.Regexp
-	}
-
 	return newPathConf.Equal(clone)
 }
 
@@ -221,15 +219,17 @@ func (pm *pathManager) doReloadConf(newPaths map[string]*conf.Path) {
 			continue
 		}
 
-		// path now belongs to a different config with exact name match
-		if newConf, exists := newPaths[pathName]; exists && newConf.Name == pathName {
-			if pathConfCanBeUpdated(path.conf, newConf) {
+		// path now belongs to a different config
+		if pathConf.Name != path.conf.Name {
+			// path config can be hot reloaded
+			if pathConfCanBeUpdated(path.conf, pathConf) {
 				// Hot reload the path with the new configuration
-				go path.reloadConf(newConf)
-			} else {
-				// Configuration cannot be hot reloaded: recreate the path
-				pm.removeAndClosePath(path)
+				go path.reloadConf(pathConf)
+				continue
 			}
+
+			// Configuration cannot be hot reloaded: delete the path
+			pm.removeAndClosePath(path)
 			continue
 		}
 

internal/core/path_manager_test.go

@@ -169,4 +169,17 @@ func TestPathConfigurationHotReload(t *testing.T) {
 
 	// Verify the path is still ready and functional
 	require.Equal(t, true, pathData.Ready)
+
+	// revert configuration
+	httpRequest(t, hc, http.MethodDelete, "http://localhost:9997/v3/config/paths/delete/undefined_stream",
+		nil, nil)
+
+	// Give the system time to process the configuration change
+	time.Sleep(200 * time.Millisecond)
+
+	// Verify the path now uses the old configuration
+	pathData, err = p.pathManager.APIPathsGet("undefined_stream")
+	require.NoError(t, err)
+	require.Equal(t, "undefined_stream", pathData.Name)
+	require.Equal(t, "all", pathData.ConfName)
 }