moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace old ActiveLock system with a slightly better one 

CyTube has been crashing recently due to things attempting to release
the reference after the channel was already closed (apparently the
uncaughtException handler isn't called for this?).  This newer
implementation keeps track of what is ref'ing and unref'ing it, so it
can log an error if it detects a discrepancy.

Also changed the server to not delete the refCounter field from the
channel when it's unloaded, so that should reduce the number of errors
stemming from it being null/undefined.
This commit is contained in:
calzoneman 2015-12-25 17:07:25 -08:00
parent e88971a011
commit be4011cda1
6 changed files with 138 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/channel/channel.js
View File

@ -12,39 +12,65 @@ import * as ChannelStore from '../channel-storage/channelstore';
import { ChannelStateSizeError } from '../errors'; import { ChannelStateSizeError } from '../errors';
import Promise from 'bluebird'; import Promise from 'bluebird';
/** class ReferenceCounter {
* Previously, async channel functions were riddled with race conditions due to constructor(channel) {
* an event causing the channel to be unloaded while a pending callback still
* needed to reference it.
*
* This solution should be better than constantly checking whether the channel
* has been unloaded in nested callbacks. The channel won't be unloaded until
* nothing needs it anymore. Conceptually similar to a reference count.
*/
function ActiveLock(channel) {
this.channel = channel; this.channel = channel;
this.count = 0; this.channelName = channel.name;
} this.refCount = 0;
this.references = {};
}
ActiveLock.prototype = { ref(caller) {
lock: function () { if (caller) {
this.count++; if (this.references.hasOwnProperty(caller)) {
}, this.references[caller]++;
} else {
this.references[caller] = 1;
}
}
release: function () { this.refCount++;
this.count--; }
if (this.count === 0) {
/* sanity check */ unref(caller) {
if (this.channel.users.length > 0) { if (caller) {
Logger.errlog.log("Warning: ActiveLock count=0 but users.length > 0 (" + if (this.references.hasOwnProperty(caller)) {
"channel: " + this.channel.name + ")"); this.references[caller]--;
this.count = this.channel.users.length; if (this.references[caller] === 0) {
delete this.references[caller];
}
} else {
Logger.errlog.log("ReferenceCounter::unref() called by caller [" +
caller + "] but this caller had no active references! " +
`(channel: ${this.channelName})`);
}
}
this.refCount--;
this.checkRefCount();
}
checkRefCount() {
if (this.refCount === 0) {
if (Object.keys(this.references).length > 0) {
Logger.errlog.log("ReferenceCounter::refCount reached 0 but still had " +
"active references: " +
JSON.stringify(Object.keys(this.references)) +
` (channel: ${this.channelName})`);
for (var caller in this.references) {
this.refCount += this.references[caller];
}
} else if (this.channel.users.length > 0) {
Logger.errlog.log("ReferenceCounter::refCount reached 0 but still had " +
this.channel.users.length + " active users" +
` (channel: ${this.channelName})`);
this.refCount = this.channel.users.length;
} else { } else {
this.channel.emit("empty"); this.channel.emit("empty");
} }
} }
} }
}; }
function Channel(name) { function Channel(name) {
MakeEmitter(this); MakeEmitter(this);
@ -54,7 +80,7 @@ function Channel(name) {
this.logger = new Logger.Logger(path.join(__dirname, "..", "..", "chanlogs", this.logger = new Logger.Logger(path.join(__dirname, "..", "..", "chanlogs",
this.uniqueName + ".log")); this.uniqueName + ".log"));
this.users = []; this.users = [];
this.activeLock = new ActiveLock(this); this.refCounter = new ReferenceCounter(this);
this.flags = 0; this.flags = 0;
var self = this; var self = this;
db.channels.load(this, function (err) { db.channels.load(this, function (err) {
@ -238,15 +264,16 @@ Channel.prototype.saveState = function () {
}; };
Channel.prototype.checkModules = function (fn, args, cb) { Channel.prototype.checkModules = function (fn, args, cb) {
var self = this; const self = this;
const refCaller = `Channel::checkModules/${fn}`;
this.waitFlag(Flags.C_READY, function () { this.waitFlag(Flags.C_READY, function () {
self.activeLock.lock(); self.refCounter.ref(refCaller);
var keys = Object.keys(self.modules); var keys = Object.keys(self.modules);
var next = function (err, result) { var next = function (err, result) {
if (result !== ChannelModule.PASSTHROUGH) { if (result !== ChannelModule.PASSTHROUGH) {
/* Either an error occured, or the module denied the user access */ /* Either an error occured, or the module denied the user access */
cb(err, result); cb(err, result);
self.activeLock.release(); self.refCounter.unref(refCaller);
return; return;
} }
@ -254,7 +281,7 @@ Channel.prototype.checkModules = function (fn, args, cb) {
if (m === undefined) { if (m === undefined) {
/* No more modules to check */ /* No more modules to check */
cb(null, ChannelModule.PASSTHROUGH); cb(null, ChannelModule.PASSTHROUGH);
self.activeLock.release(); self.refCounter.unref(refCaller);
return; return;
} }
@ -278,13 +305,13 @@ Channel.prototype.notifyModules = function (fn, args) {
}; };
Channel.prototype.joinUser = function (user, data) { Channel.prototype.joinUser = function (user, data) {
var self = this; const self = this;
self.activeLock.lock(); self.refCounter.ref("Channel::user");
self.waitFlag(Flags.C_READY, function () { self.waitFlag(Flags.C_READY, function () {
/* User closed the connection before the channel finished loading */ /* User closed the connection before the channel finished loading */
if (user.socket.disconnected) { if (user.socket.disconnected) {
self.activeLock.release(); self.refCounter.unref("Channel::user");
return; return;
} }
@ -293,7 +320,7 @@ Channel.prototype.joinUser = function (user, data) {
if (err) { if (err) {
Logger.errlog.log("user.refreshAccount failed at Channel.joinUser"); Logger.errlog.log("user.refreshAccount failed at Channel.joinUser");
Logger.errlog.log(err.stack); Logger.errlog.log(err.stack);
self.activeLock.release(); self.refCounter.unref("Channel::user");
return; return;
} }
@ -304,8 +331,10 @@ Channel.prototype.joinUser = function (user, data) {
} }
function afterAccount() { function afterAccount() {
if (self.dead || user.socket.disconnected) { if (user.socket.disconnected) {
if (self.activeLock) self.activeLock.release(); self.refCounter.unref("Channel::user");
return;
} else if (self.dead) {
return; return;
} }
@ -318,9 +347,7 @@ Channel.prototype.joinUser = function (user, data) {
} else { } else {
user.account.channelRank = 0; user.account.channelRank = 0;
user.account.effectiveRank = user.account.globalRank; user.account.effectiveRank = user.account.globalRank;
if (self.activeLock) { self.refCounter.unref("Channel::user");
self.activeLock.release();
}
} }
}); });
} }
@ -408,7 +435,7 @@ Channel.prototype.partUser = function (user) {
}); });
this.sendUsercount(this.users); this.sendUsercount(this.users);
this.activeLock.release(); this.refCounter.unref("Channel::user");
user.die(); user.die();
}; };
@ -555,20 +582,20 @@ Channel.prototype.sendUserJoin = function (users, user) {
}; };
Channel.prototype.readLog = function (cb) { Channel.prototype.readLog = function (cb) {
var maxLen = 102400; const maxLen = 102400;
var file = this.logger.filename; const file = this.logger.filename;
this.activeLock.lock(); this.refCounter.ref("Channel::readLog");
var self = this; const self = this;
fs.stat(file, function (err, data) { fs.stat(file, function (err, data) {
if (err) { if (err) {
self.activeLock.release(); self.refCounter.unref("readLog");
return cb(err, null); return cb(err, null);
} }
var start = Math.max(data.size - maxLen, 0); const start = Math.max(data.size - maxLen, 0);
var end = data.size - 1; const end = data.size - 1;
var read = fs.createReadStream(file, { const read = fs.createReadStream(file, {
start: start, start: start,
end: end end: end
}); });
@ -579,7 +606,7 @@ Channel.prototype.readLog = function (cb) {
}); });
read.on("end", function () { read.on("end", function () {
cb(null, buffer); cb(null, buffer);
self.activeLock.release(); self.refCounter.unref("Channel::readLog");
}); });
}); });
}; };
@ -648,7 +675,7 @@ Channel.prototype.packInfo = function (isAdmin) {
} }
if (isAdmin) { if (isAdmin) {
data.activeLockCount = this.activeLock.count; data.activeLockCount = this.refCounter.refCount;
} }
var self = this; var self = this;

24
src/channel/kickban.js
View File

@ -73,9 +73,10 @@ KickBanModule.prototype.onUserPostJoin = function (user) {
return; return;
} }
var chan = this.channel; const chan = this.channel;
const refCaller = "KickBanModule::onUserPostJoin";
user.waitFlag(Flags.U_LOGGED_IN, function () { user.waitFlag(Flags.U_LOGGED_IN, function () {
chan.activeLock.lock(); chan.refCounter.ref(refCaller);
db.channels.isNameBanned(chan.name, user.getName(), function (err, banned) { db.channels.isNameBanned(chan.name, user.getName(), function (err, banned) {
if (!err && banned) { if (!err && banned) {
user.kick("You are banned from this channel."); user.kick("You are banned from this channel.");
@ -84,7 +85,7 @@ KickBanModule.prototype.onUserPostJoin = function (user) {
"name is banned)"); "name is banned)");
} }
} }
chan.activeLock.release(); chan.refCounter.unref(refCaller);
}); });
}); });
@ -222,10 +223,10 @@ KickBanModule.prototype.handleCmdBan = function (user, msg, meta) {
var name = args.shift().toLowerCase(); var name = args.shift().toLowerCase();
var reason = args.join(" "); var reason = args.join(" ");
var chan = this.channel; const chan = this.channel;
chan.activeLock.lock(); chan.refCounter.ref("KickBanModule::handleCmdBan");
this.banName(user, name, reason, function (err) { this.banName(user, name, reason, function (err) {
chan.activeLock.release(); chan.refCounter.unref("KickBanModule::handleCmdBan");
}); });
}; };
@ -249,10 +250,10 @@ KickBanModule.prototype.handleCmdIPBan = function (user, msg, meta) {
} }
var reason = args.join(" "); var reason = args.join(" ");
var chan = this.channel; const chan = this.channel;
chan.activeLock.lock(); chan.refCounter.ref("KickBanModule::handleCmdIPBan");
this.banAll(user, name, range, reason, function (err) { this.banAll(user, name, range, reason, function (err) {
chan.activeLock.release(); chan.refCounter.unref("KickBanModule::handleCmdIPBan");
}); });
}; };
@ -416,9 +417,10 @@ KickBanModule.prototype.handleUnban = function (user, data) {
} }
var self = this; var self = this;
this.channel.activeLock.lock(); this.channel.refCounter.ref("KickBanModule::handleUnban");
db.channels.unbanId(this.channel.name, data.id, function (err) { db.channels.unbanId(this.channel.name, data.id, function (err) {
if (err) { if (err) {
self.channel.refCounter.unref("KickBanModule::handleUnban");
return user.socket.emit("errorMsg", { return user.socket.emit("errorMsg", {
msg: err msg: err
}); });
@ -431,7 +433,7 @@ KickBanModule.prototype.handleUnban = function (user, data) {
self.channel.modules.chat.sendModMessage(user.getName() + " unbanned " + self.channel.modules.chat.sendModMessage(user.getName() + " unbanned " +
data.name, banperm); data.name, banperm);
} }
self.channel.activeLock.release(); self.channel.refCounter.unref("KickBanModule::handleUnban");
}); });
}; };

11
src/channel/library.js
View File

@ -51,16 +51,19 @@ LibraryModule.prototype.handleUncache = function (user, data) {
return; return;
} }
var chan = this.channel; const chan = this.channel;
chan.activeLock.lock(); chan.refCounter.ref("LibraryModule::handleUncache");
db.channels.deleteFromLibrary(chan.name, data.id, function (err, res) { db.channels.deleteFromLibrary(chan.name, data.id, function (err, res) {
if (chan.dead || err) { if (chan.dead) {
return;
} else if (err) {
chan.refCounter.unref("LibraryModule::handleUncache");
return; return;
} }
chan.logger.log("[library] " + user.getName() + " deleted " + data.id + chan.logger.log("[library] " + user.getName() + " deleted " + data.id +
"from the library"); "from the library");
chan.activeLock.release(); chan.refCounter.unref("LibraryModule::handleUncache");
}); });
}; };

29
src/channel/mediarefresher.js
View File

@ -63,8 +63,8 @@ MediaRefresherModule.prototype.initVimeo = function (data, cb) {
return; return;
} }
var self = this; const self = this;
self.channel.activeLock.lock(); self.channel.refCounter.ref("MediaRefresherModule::initVimeo");
Vimeo.extract(data.id).then(function (direct) { Vimeo.extract(data.id).then(function (direct) {
if (self.dead || self.channel.dead) if (self.dead || self.channel.dead)
return; return;
@ -74,12 +74,13 @@ MediaRefresherModule.prototype.initVimeo = function (data, cb) {
self.channel.logger.log("[mediarefresher] Refreshed vimeo video with ID " + self.channel.logger.log("[mediarefresher] Refreshed vimeo video with ID " +
data.id); data.id);
} }
self.channel.activeLock.release();
if (cb) cb(); if (cb) cb();
}).catch(function (err) { }).catch(function (err) {
Logger.errlog.log("Unexpected vimeo::extract() fail: " + err.stack); Logger.errlog.log("Unexpected vimeo::extract() fail: " + err.stack);
if (cb) cb(); if (cb) cb();
}).finally(() => {
self.channel.refCounter.unref("MediaRefresherModule::initVimeo");
}); });
}; };
@ -90,7 +91,7 @@ MediaRefresherModule.prototype.refreshGoogleDocs = function (media, cb) {
return; return;
} }
self.channel.activeLock.lock(); self.channel.refCounter.ref("MediaRefresherModule::refreshGoogleDocs");
InfoGetter.getMedia(media.id, "gd", function (err, data) { InfoGetter.getMedia(media.id, "gd", function (err, data) {
if (self.dead || self.channel.dead) { if (self.dead || self.channel.dead) {
return; return;
@ -108,7 +109,7 @@ MediaRefresherModule.prototype.refreshGoogleDocs = function (media, cb) {
self.channel.logger.log("[mediarefresher] Google Docs refresh failed " + self.channel.logger.log("[mediarefresher] Google Docs refresh failed " +
"(likely redirect to login page-- make sure it is shared " + "(likely redirect to login page-- make sure it is shared " +
"correctly)"); "correctly)");
self.channel.activeLock.release(); self.channel.refCounter.unref("MediaRefresherModule::refreshGoogleDocs");
if (cb) cb(); if (cb) cb();
return; return;
case "Access Denied": case "Access Denied":
@ -119,7 +120,7 @@ MediaRefresherModule.prototype.refreshGoogleDocs = function (media, cb) {
case "Google Drive videos must be shared publicly": case "Google Drive videos must be shared publicly":
self.channel.logger.log("[mediarefresher] Google Docs refresh failed: " + self.channel.logger.log("[mediarefresher] Google Docs refresh failed: " +
err); err);
self.channel.activeLock.release(); self.channel.refCounter.unref("MediaRefresherModule::refreshGoogleDocs");
if (cb) cb(); if (cb) cb();
return; return;
default: default:
@ -128,14 +129,14 @@ MediaRefresherModule.prototype.refreshGoogleDocs = function (media, cb) {
err); err);
Logger.errlog.log("Google Docs refresh failed for ID " + media.id + Logger.errlog.log("Google Docs refresh failed for ID " + media.id +
": " + err); ": " + err);
self.channel.activeLock.release(); self.channel.refCounter.unref("MediaRefresherModule::refreshGoogleDocs");
if (cb) cb(); if (cb) cb();
return; return;
} }
} }
if (media !== self._media) { if (media !== self._media) {
self.channel.activeLock.release(); self.channel.refCounter.unref("MediaRefresherModule::refreshGoogleDocs");
if (cb) cb(); if (cb) cb();
return; return;
} }
@ -143,7 +144,7 @@ MediaRefresherModule.prototype.refreshGoogleDocs = function (media, cb) {
self.channel.logger.log("[mediarefresher] Refreshed Google Docs video with ID " + self.channel.logger.log("[mediarefresher] Refreshed Google Docs video with ID " +
media.id); media.id);
media.meta = data.meta; media.meta = data.meta;
self.channel.activeLock.release(); self.channel.refCounter.unref("MediaRefresherModule::refreshGoogleDocs");
if (cb) cb(); if (cb) cb();
}); });
}; };
@ -155,7 +156,7 @@ MediaRefresherModule.prototype.initGooglePlus = function (media, cb) {
return; return;
} }
self.channel.activeLock.lock(); self.channel.refCounter.ref("MediaRefresherModule::initGooglePlus");
InfoGetter.getMedia(media.id, "gp", function (err, data) { InfoGetter.getMedia(media.id, "gp", function (err, data) {
if (self.dead || self.channel.dead) { if (self.dead || self.channel.dead) {
return; return;
@ -177,7 +178,7 @@ MediaRefresherModule.prototype.initGooglePlus = function (media, cb) {
"and is shared publicly"): "and is shared publicly"):
self.channel.logger.log("[mediarefresher] Google+ refresh failed: " + self.channel.logger.log("[mediarefresher] Google+ refresh failed: " +
err); err);
self.channel.activeLock.release(); self.channel.refCounter.unref("MediaRefresherModule::initGooglePlus");
if (cb) cb(); if (cb) cb();
return; return;
default: default:
@ -186,14 +187,14 @@ MediaRefresherModule.prototype.initGooglePlus = function (media, cb) {
err); err);
Logger.errlog.log("Google+ refresh failed for ID " + media.id + Logger.errlog.log("Google+ refresh failed for ID " + media.id +
": " + err); ": " + err);
self.channel.activeLock.release(); self.channel.refCounter.unref("MediaRefresherModule::initGooglePlus");
if (cb) cb(); if (cb) cb();
return; return;
} }
} }
if (media !== self._media) { if (media !== self._media) {
self.channel.activeLock.release(); self.channel.refCounter.unref("MediaRefresherModule::initGooglePlus");
if (cb) cb(); if (cb) cb();
return; return;
} }
@ -201,7 +202,7 @@ MediaRefresherModule.prototype.initGooglePlus = function (media, cb) {
self.channel.logger.log("[mediarefresher] Refreshed Google+ video with ID " + self.channel.logger.log("[mediarefresher] Refreshed Google+ video with ID " +
media.id); media.id);
media.meta = data.meta; media.meta = data.meta;
self.channel.activeLock.release(); self.channel.refCounter.unref("MediaRefresherModule::initGooglePlus");
if (cb) cb(); if (cb) cb();
}); });
}; };

104
src/channel/playlist.js
View File

@ -447,15 +447,15 @@ PlaylistModule.prototype.queueStandard = function (user, data) {
}); });
}; };
var self = this; const self = this;
this.channel.activeLock.lock(); this.channel.refCounter.ref("PlaylistModule::queueStandard");
this.semaphore.queue(function (lock) { this.semaphore.queue(function (lock) {
var lib = self.channel.modules.library; var lib = self.channel.modules.library;
if (lib && self.channel.is(Flags.C_REGISTERED) && !util.isLive(data.type)) { if (lib && self.channel.is(Flags.C_REGISTERED) && !util.isLive(data.type)) {
lib.getItem(data.id, function (err, item) { lib.getItem(data.id, function (err, item) {
if (err && err !== "Item not in library") { if (err && err !== "Item not in library") {
error(err+""); error(err+"");
self.channel.activeLock.release(); self.channel.refCounter.unref("PlaylistModule::queueStandard");
return lock.release(); return lock.release();
} }
@ -464,7 +464,7 @@ PlaylistModule.prototype.queueStandard = function (user, data) {
data.shouldAddToLibrary = false; data.shouldAddToLibrary = false;
self._addItem(item, data, user, function () { self._addItem(item, data, user, function () {
lock.release(); lock.release();
self.channel.activeLock.release(); self.channel.refCounter.unref("PlaylistModule::queueStandard");
}); });
} else { } else {
handleLookup(); handleLookup();
@ -479,25 +479,13 @@ PlaylistModule.prototype.queueStandard = function (user, data) {
InfoGetter.getMedia(data.id, data.type, function (err, media) { InfoGetter.getMedia(data.id, data.type, function (err, media) {
if (err) { if (err) {
error(XSS.sanitizeText(String(err))); error(XSS.sanitizeText(String(err)));
if (self.channel && self.channel.activeLock) { self.channel.refCounter.unref("PlaylistModule::queueStandard");
self.channel.activeLock.release();
} else {
Logger.errlog.log("Attempted release of channel lock after " +
"channel was already unloaded in queueStandard: " +
channelName + " " + data.type + ":" + data.id);
}
return lock.release(); return lock.release();
} }
self._addItem(media, data, user, function () { self._addItem(media, data, user, function () {
lock.release(); lock.release();
if (self.channel && self.channel.activeLock) { self.channel.refCounter.unref("PlaylistModule::queueStandard");
self.channel.activeLock.release();
} else {
Logger.errlog.log("Attempted release of channel lock after " +
"channel was already unloaded in queueStandard: " +
channelName + " " + data.type + ":" + data.id);
}
}); });
}); });
} }
@ -536,12 +524,12 @@ PlaylistModule.prototype.queueYouTubePlaylist = function (user, data) {
} }
} }
self.channel.activeLock.lock(); self.channel.refCounter.ref("PlaylistModule::queueYouTubePlaylist");
vids.forEach(function (media) { vids.forEach(function (media) {
data.link = util.formatLink(media.id, media.type); data.link = util.formatLink(media.id, media.type);
self._addItem(media, data, user); self._addItem(media, data, user);
}); });
self.channel.activeLock.release(); self.channel.refCounter.unref("PlaylistModule::queueYouTubePlaylist");
lock.release(); lock.release();
}); });
@ -560,7 +548,7 @@ PlaylistModule.prototype.handleDelete = function (user, data) {
} }
var plitem = this.items.find(data); var plitem = this.items.find(data);
self.channel.activeLock.lock(); self.channel.refCounter.ref("PlaylistModule::handleDelete");
this.semaphore.queue(function (lock) { this.semaphore.queue(function (lock) {
if (self._delete(data)) { if (self._delete(data)) {
self.channel.logger.log("[playlist] " + user.getName() + " deleted " + self.channel.logger.log("[playlist] " + user.getName() + " deleted " +
@ -568,7 +556,7 @@ PlaylistModule.prototype.handleDelete = function (user, data) {
} }
lock.release(); lock.release();
self.channel.activeLock.release(); self.channel.refCounter.unref("PlaylistModule::handleDelete");
}); });
}; };
@ -602,27 +590,27 @@ PlaylistModule.prototype.handleMoveMedia = function (user, data) {
return; return;
} }
var self = this; const self = this;
self.channel.activeLock.lock(); self.channel.refCounter.ref("PlaylistModule::handleMoveMedia");
self.semaphore.queue(function (lock) { self.semaphore.queue(function (lock) {
if (!self.items.remove(data.from)) { if (!self.items.remove(data.from)) {
self.channel.activeLock.release(); self.channel.refCounter.unref("PlaylistModule::handleMoveMedia");
return lock.release(); return lock.release();
} }
if (data.after === "prepend") { if (data.after === "prepend") {
if (!self.items.prepend(from)) { if (!self.items.prepend(from)) {
self.channel.activeLock.release(); self.channel.refCounter.unref("PlaylistModule::handleMoveMedia");
return lock.release(); return lock.release();
} }
} else if (data.after === "append") { } else if (data.after === "append") {
if (!self.items.append(from)) { if (!self.items.append(from)) {
self.channel.activeLock.release(); self.channel.refCounter.unref("PlaylistModule::handleMoveMedia");
return lock.release(); return lock.release();
} }
} else { } else {
if (!self.items.insertAfter(from, data.after)) { if (!self.items.insertAfter(from, data.after)) {
self.channel.activeLock.release(); self.channel.refCounter.unref("PlaylistModule::handleMoveMedia");
return lock.release(); return lock.release();
} }
} }
@ -633,7 +621,7 @@ PlaylistModule.prototype.handleMoveMedia = function (user, data) {
from.media.title + from.media.title +
(after ? " after " + after.media.title : "")); (after ? " after " + after.media.title : ""));
lock.release(); lock.release();
self.channel.activeLock.release(); self.channel.refCounter.unref("PlaylistModule::handleMoveMedia");
}); });
}; };
@ -1128,55 +1116,6 @@ PlaylistModule.prototype._leadLoop = function() {
} }
}; };
PlaylistModule.prototype.refreshGoogleDocs = function (cb) {
var self = this;
if (self.dead || !self.channel || self.channel.dead) {
return;
}
var abort = function () {
if (self.current) {
self.current.media.meta.object = self.current.media.meta.object || null;
self.current.media.meta.failed = true;
}
if (cb) {
cb();
}
};
if (!this.current || this.current.media.type !== "gd") {
return abort();
}
self.channel.activeLock.lock();
InfoGetter.getMedia(this.current.media.id, "gd", function (err, media) {
if (err) {
Logger.errlog.log("Google Docs autorefresh failed: " + err);
Logger.errlog.log("ID was: " + self.current.media.id);
if (self.current) {
self.current.media.meta.object = self.current.media.meta.object || null;
self.current.media.meta.failed = true;
}
if (cb) {
cb();
}
self.channel.activeLock.release();
} else {
if (!self.current || self.current.media.type !== "gd") {
self.channel.activeLock.release();
return abort();
}
self.current.media.meta = media.meta;
self.current.media.meta.expiration = Date.now() + 3600000;
self.channel.logger.log("[playlist] Auto-refreshed Google Doc video");
cb && cb();
self.channel.activeLock.release();
}
});
};
PlaylistModule.prototype._playNext = function () { PlaylistModule.prototype._playNext = function () {
if (!this.current) { if (!this.current) {
return; return;
@ -1335,10 +1274,11 @@ PlaylistModule.prototype.handleQueuePlaylist = function (user, data) {
pos: data.pos pos: data.pos
}; };
var self = this; const self = this;
self.channel.activeLock.lock(); self.channel.refCounter.ref("PlaylistModule::handleQueuePlaylist");
db.getUserPlaylist(user.getName(), data.name, function (err, pl) { db.getUserPlaylist(user.getName(), data.name, function (err, pl) {
if (err) { if (err) {
self.channel.refCounter.unref("PlaylistModule::handleQueuePlaylist");
return user.socket.emit("errorMsg", { return user.socket.emit("errorMsg", {
msg: "Playlist load failed: " + err msg: "Playlist load failed: " + err
}); });
@ -1369,7 +1309,6 @@ PlaylistModule.prototype.handleQueuePlaylist = function (user, data) {
var m = new Media(item.id, item.title, item.seconds, item.type, item.meta); var m = new Media(item.id, item.title, item.seconds, item.type, item.meta);
self._addItem(m, qdata, user); self._addItem(m, qdata, user);
}); });
self.channel.activeLock.release();
} catch (e) { } catch (e) {
Logger.errlog.log("Loading user playlist failed!"); Logger.errlog.log("Loading user playlist failed!");
Logger.errlog.log("PL: " + user.getName() + "-" + data.name); Logger.errlog.log("PL: " + user.getName() + "-" + data.name);
@ -1378,7 +1317,8 @@ PlaylistModule.prototype.handleQueuePlaylist = function (user, data) {
msg: "Internal error occurred when loading playlist.", msg: "Internal error occurred when loading playlist.",
link: null link: null
}); });
self.channel.activeLock.release(); } finally {
self.channel.refCounter.unref("PlaylistModule::handleQueuePlaylist");
} }
}); });
}; };

2
src/server.js
View File

@ -208,8 +208,10 @@ Server.prototype.unloadChannel = function (chan) {
// Empty all outward references from the channel // Empty all outward references from the channel
var keys = Object.keys(chan); var keys = Object.keys(chan);
for (var i in keys) { for (var i in keys) {
if (keys[i] !== "refCounter") {
delete chan[keys[i]]; delete chan[keys[i]];
} }
}
chan.dead = true; chan.dead = true;
}; };