Adding better checking for streams

ystv · Feb 20, 2024 · 05e8931 · 05e8931
1 parent 586175f
commit 05e8931
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/forwarder/main.go b/forwarder/main.go
@@ -302,7 +302,7 @@ func (v *Views) run(config Config, interrupt chan os.Signal) {
 					continue
 				}
 			case "status":
-				_, ok := v.cache.Get(fmt.Sprintf("%s_1", t.Unique))
+				_, ok := v.cache.Get(fmt.Sprintf("%s_1_%s", t.Unique, finishChannelNameAppend))
 				if !ok {
 					kill := v.errorResponse(fmt.Errorf("failed to get status, invalid unique: %s", t.Unique), c, m.ID)
 					if kill {

diff --git a/recorder/main.go b/recorder/main.go
@@ -306,6 +306,15 @@ func (v *Views) run(config Config, interrupt chan os.Signal) {
 					continue
 				}
 			case "status":
+				_, ok := v.cache.Get(fmt.Sprintf("%s_%s", t.Unique, finishChannelNameAppend))
+				if !ok {
+					kill := v.errorResponse(fmt.Errorf("failed to get status recorder, invalid unique: %s", t.Unique), c, m.ID)
+					if kill {
+						return
+					}
+					continue
+				}
+
 				out, err = v.status(t)
 				if err != nil {
 					kill := v.errorResponse(fmt.Errorf("failed to get status recorder: %w", err), c, m.ID)
@@ -315,6 +324,15 @@ func (v *Views) run(config Config, interrupt chan os.Signal) {
 					continue
 				}
 			case "stop":
+				_, ok := v.cache.Get(fmt.Sprintf("%s_%s", t.Unique, finishChannelNameAppend))
+				if !ok {
+					kill := v.errorResponse(fmt.Errorf("failed to stop recorder, invalid unique: %s", t.Unique), c, m.ID)
+					if kill {
+						return
+					}
+					continue
+				}
+
 				err = v.stop(t)
 				if err != nil {
 					kill := v.errorResponse(fmt.Errorf("failed to stop recorder: %w", err), c, m.ID)