main: resilience on decodeSuccess, add more debug

streamroot · Oct 24, 2014 · 4c5cd3d · 4c5cd3d
1 parent 6521510
commit 4c5cd3d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main.js b/src/main.js
@@ -80,10 +80,12 @@ class P2PHLS extends HLS {
   }
 
   onDecodeSuccess() {
-    this.resourceRequester.decodingError = false
-    this.storage.setItem(this.currentUrl, this.currentChunk)
-    this.currentUrl = null
-    this.currentChunk = null
+    if (this.currentUrl) {
+      this.resourceRequester.decodingError = false
+      this.storage.setItem(this.currentUrl, this.currentChunk)
+      this.currentUrl = null
+      this.currentChunk = null
+    }
   }
 
   requestResource(url) {

diff --git a/src/peer.js b/src/peer.js
@@ -24,6 +24,7 @@ class Peer extends BaseObject {
 
   sendSatisfy(resource) {
     if (this.uploadHandler.getSlot(this.ident)) {
+      log.warn("sending chunk")
       this.send('satisfy', resource, this.storage.getItem(resource))
       this.playbackInfo.updateChunkStats('p2psent')
     } else {
@@ -61,7 +62,7 @@ class Peer extends BaseObject {
         break
       case 'satisfy':
         if (content.length > 0) {
-          log.debug('received _satisfy_ ' + content.length)
+          log.debug('received _satisfy_ ')
           this.swarm.satisfyReceived(this, resource, content)
         }
         break

diff --git a/src/swarm.js b/src/swarm.js
@@ -45,7 +45,6 @@ class Swarm extends BaseObject {
     var successPeer = this.utils.findPeer(this.satisfyElected)
     var goodPeers = _.union([successPeer], this.satisfyCandidates)
     var badPeers = _.difference(this.contributors, goodPeers)
-    log.info("contributors good: " + goodPeers.length)
     this.utils.incrementScore(goodPeers)
     this.utils.incrementScore([successPeer]) //double satisfyElected score gain :)
     this.utils.decrementScore(badPeers)