Merge pull request #35 from mediainbox/fix-reconnect-icecast

fix: ignore icecast connection status in reconnect logic when failed to connect
mediainbox · Aug 31, 2017 · 4044975 · 4044975
2 parents d6de845 + 36da8ca
commit 4044975
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/js/src/streammachine/sources/proxy.js b/js/src/streammachine/sources/proxy.js
diff --git a/js/src/streammachine/sources/proxy.js.map b/js/src/streammachine/sources/proxy.js.map
diff --git a/src/streammachine/sources/proxy.coffee b/src/streammachine/sources/proxy.coffee
@@ -132,9 +132,9 @@ module.exports = class ProxySource extends require("./base")
             setTimeout @checkStatus, 30000
 
         @ireq.once "error", (err) =>
-            debug "Gor icecast stream error #{err}, reconnecting"
+            debug "Got icecast stream error #{err}, reconnecting"
             @_niceError err
-            @reconnect()
+            @reconnect(true)
 
         # outgoing -> Stream
         @on "_chunk", @broadcastData
@@ -166,8 +166,10 @@ module.exports = class ProxySource extends require("./base")
 
     #----------
 
-    reconnect: =>
-        return unless @connected
+    reconnect: (ignoreConnectionStatus = false) =>
+        # Ignore reconnection if there is an active connection or the "ignore status" flag given is false
+        if !@connected && !ignoreConnectionStatus
+          return
 
         msWaitToConnect = 5000
         debug "Reconnect to Icecast source from #{@url} in #{msWaitToConnect}ms"