Alter channel unload behavior, add additional checks

- Should prevent "write after end" errors caused by unloading a channel before it finishes loading
- Might prevent strange cases of playlists gone wild

lib/channel.js

@@ -119,8 +119,12 @@ var Channel = function(name, Server) {
         self.ipkey += "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[parseInt(Math.random() * 65)]
     }
 
-    Server.db.loadChannelData(self, function () {
-        self.dbloaded = true;
+    Server.db.loadChannelData(self, function (err) {
+        if (err && err === "channel_dead")
+                return;
+        else if (!err || err === "channel_unregistered")
+            self.dbloaded = true;
+
         if(self.registered) {
             self.loadDump();
         }
@@ -150,6 +154,9 @@ Channel.prototype.loadDump = function() {
         return;
     fs.stat(path.join(__dirname, "../chandump", self.name),
             function (err, stats) {
+        if (self.dead)
+            return;
+
         if(!err) {
             var mb = stats.size / 1048576;
             mb = parseInt(mb * 100) / 100;
@@ -165,6 +172,9 @@ Channel.prototype.loadDump = function() {
         }
         fs.readFile(path.join(__dirname, "../chandump", self.name),
                     function(err, data) {
+            if (self.dead)
+                return;
+
             if(err) {
                 if(err.code == "ENOENT") {
                     Logger.errlog.log("WARN: missing dump for " + self.name);

lib/database.js

@@ -405,7 +405,12 @@ Database.prototype.loadChannelData = function (chan, callback) {
         }
 
         if(res.length == 0) {
-            callback("Channel is unregistered", null);
+            callback("channel_unregistered", null);
+            return;
+        }
+
+        if (chan.dead) {
+            callback("channel_dead", null);
             return;
         }
 
@@ -416,6 +421,11 @@ Database.prototype.loadChannelData = function (chan, callback) {
         // Load bans
         query = "SELECT * FROM `chan_" + chan.name + "_bans`";
         self.query(query, function (err, res) {
+            if (chan.dead) {
+                callback("channel_dead", null);
+                return;
+            }
+
             if(err) {
                 callback(err, null);
                 return;

lib/playlist.js

@@ -59,14 +59,26 @@ function Playlist(chan) {
     this.server = chan.server;
     var pl = this;
     this.on("mediaUpdate", function(m) {
+        if (chan.dead) {
+            pl.die();
+            return;
+        }
         chan.sendAll("mediaUpdate", m.timeupdate());
     });
     this.on("changeMedia", function(m) {
+        if (chan.dead) {
+            pl.die();
+            return;
+        }
         chan.onVideoChange();
         chan.sendAll("setCurrent", pl.current.uid);
         chan.sendAll("changeMedia", m.fullupdate());
     });
     this.on("remove", function(item) {
+        if (chan.dead) {
+            pl.die();
+            return;
+        }
         chan.broadcastPlaylistMeta();
         chan.sendAll("delete", {
             uid: item.uid

lib/server.js

@@ -62,8 +62,11 @@ var Server = {
                 break;
             }
         }
-        chan.name = "";
-        chan.canonical_name = "";
+        var keys = Object.keys(chan);
+        for (var i in keys) {
+            delete chan[keys[i]];
+        }
+        chan.dead = true;
     },
     stats: null,
     app: null,