specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Unload empty channels

Browse source
This commit is contained in:
Calvin Montgomery 2013-05-03 22:15:05 +04:00
parent 923ecc2bf3
commit 627fcec448
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
channel.js
View file

@ -17,7 +17,8 @@ var Media = require("./media.js").Media;
var formatTime = require("./media.js").formatTime; var formatTime = require("./media.js").formatTime;
var Logger = require("./logger.js"); var Logger = require("./logger.js");
var InfoGetter = require("./get-info.js"); var InfoGetter = require("./get-info.js");
var io = require("./server.js").io; var Server = require("./server.js");
var io = Server.io;
var Rank = require("./rank.js"); var Rank = require("./rank.js");
var Auth = require("./auth.js"); var Auth = require("./auth.js");
var ChatCommand = require("./chatcommand.js"); var ChatCommand = require("./chatcommand.js");
@ -389,6 +390,10 @@ Channel.prototype.userLeave = function(user) {
}); });
} }
this.logger.log("--- /" + user.ip + " (" + user.name + ") left"); this.logger.log("--- /" + user.ip + " (" + user.name + ") left");
if(this.users.length == 0) {
this.logger.log("*** Channel empty, unloading");
Server.unload(this);
}
} }
Channel.prototype.kick = function(user, reason) { Channel.prototype.kick = function(user, reason) {
@ -618,7 +623,8 @@ function mediaUpdate(chan, id) {
// Bail cases - video changed, someone's leader, no video playing // Bail cases - video changed, someone's leader, no video playing
if(chan.media == null || if(chan.media == null ||
id != chan.media.id || id != chan.media.id ||
chan.leader != null) { chan.leader != null ||
chan.users.length == 0) {
return; return;
} }

9
server.js
View file

@ -114,8 +114,6 @@ process.on("uncaughtException", function(err) {
process.on("exit", shutdown); process.on("exit", shutdown);
process.on("SIGINT", shutdown); process.on("SIGINT", shutdown);
function shutdown() { function shutdown() {
Logger.syslog.log("Unloading channels..."); Logger.syslog.log("Unloading channels...");
for(var name in exports.channels) { for(var name in exports.channels) {
@ -125,3 +123,10 @@ function shutdown() {
Logger.syslog.log("Shutting Down"); Logger.syslog.log("Shutting Down");
process.exit(0); process.exit(0);
} }
exports.unload = function(chan) {
if(chan.registered) {
chan.saveDump();
}
delete exports.channels[chan.name];
}