mirror of https://github.com/calzoneman/sync.git
A few small fixes
This commit is contained in:
parent
ed12dd76fd
commit
f7932166b2
|
@ -22,6 +22,9 @@ module.exports = function (Server) {
|
||||||
if((Server.cfg["trust-x-forward"] || raw === "127.0.0.1") && forward) {
|
if((Server.cfg["trust-x-forward"] || raw === "127.0.0.1") && forward) {
|
||||||
var ip = forward.split(",")[0];
|
var ip = forward.split(",")[0];
|
||||||
Logger.syslog.log("REVPROXY " + raw + " => " + ip);
|
Logger.syslog.log("REVPROXY " + raw + " => " + ip);
|
||||||
|
if (ip === undefined) {
|
||||||
|
Logger.errlog.log("WTF: ip is undefined from getIP, forward=" + forward);
|
||||||
|
}
|
||||||
return ip;
|
return ip;
|
||||||
}
|
}
|
||||||
return raw;
|
return raw;
|
||||||
|
|
|
@ -891,6 +891,12 @@ Channel.prototype.userJoin = function(user, password) {
|
||||||
self.kick(u, "Duplicate login");
|
self.kick(u, "Duplicate login");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// It's possible that by kicking the user above, the channel usercount became
|
||||||
|
// 0 and it unloaded from memory
|
||||||
|
if (this.dead) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.users.push(user);
|
this.users.push(user);
|
||||||
|
|
|
@ -758,6 +758,9 @@ function VimeoIsADoucheCopter(id, cb) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
} else if (data.indexOf("This video does not exist.") !== -1) {
|
||||||
|
cb({});
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
Logger.errlog.log("Vimeo workaround error: ");
|
Logger.errlog.log("Vimeo workaround error: ");
|
||||||
Logger.errlog.log(e);
|
Logger.errlog.log(e);
|
||||||
|
|
Loading…
Reference in New Issue