Updated onDisconnect function to call startup func

Make it so we just reset everything when we get a disconnect event
This commit is contained in:
benji7425 2017-01-04 19:06:29 +00:00
parent 8d4e3913c3
commit 62f1517767

View file

@ -17,7 +17,9 @@ var DiscordClient = {
startup: function () { startup: function () {
//check if we can connect to discordapp.com to authenticate the bot //check if we can connect to discordapp.com to authenticate the bot
Dns.resolve("discordapp.com", function (err) { Dns.resolve("discordapp.com", function (err) {
if (err) Log.error("CONNECTION ERROR: Unable to locate discordapp.com to authenticate the bot", err); if (err) {
throw "CONNECTION ERROR: Unable to locate discordapp.com to authenticate the bot", err;
}
else { else {
//if there was no error, go ahead and create and authenticate the bot //if there was no error, go ahead and create and authenticate the bot
DiscordClient.bot = new Discord.Client({ DiscordClient.bot = new Discord.Client({
@ -35,6 +37,8 @@ var DiscordClient = {
onReady: function () { onReady: function () {
Log.info("Registered/connected bot " + DiscordClient.bot.username + " - (" + DiscordClient.bot.id + ")"); Log.info("Registered/connected bot " + DiscordClient.bot.username + " - (" + DiscordClient.bot.id + ")");
clearInterval(DiscordClient.reconnectTimer);
Log.info("Setting up timer to check feed every " + Config.pollingInterval + " milliseconds"); Log.info("Setting up timer to check feed every " + Config.pollingInterval + " milliseconds");
DiscordClient.feedTimer = setInterval(Feed.checkAndPost, Config.pollingInterval); //set up the timer to check the feed DiscordClient.feedTimer = setInterval(Feed.checkAndPost, Config.pollingInterval); //set up the timer to check the feed
@ -44,15 +48,13 @@ var DiscordClient = {
onDisconnect: function (err, code) { onDisconnect: function (err, code) {
Log.event("Bot was disconnected! " + err ? err : "" + code ? code : "No disconnect code provided.\nClearing the feed timer and starting reconnect timer", "Discord.io"); Log.event("Bot was disconnected! " + err ? err : "" + code ? code : "No disconnect code provided.\nClearing the feed timer and starting reconnect timer", "Discord.io");
clearInterval(DiscordClient.feedTimer); //stop the feed timer
//set up a timer to try reconnect every 5sec
DiscordClient.reconnectTimer = setInterval(function () { DiscordClient.reconnectTimer = setInterval(function () {
try { try {
DiscordClient.bot.connect(); //I've had enough problems with reconnecting properly so just call the startup function to reset everything when we want to reconnect
DiscordClient.startup();
} }
catch (ex) { catch(ex){
Log.error("Exception thrown trying to reconnect bot." + ex.message); Log.error(ex);
} }
}); });
}, },
@ -119,7 +121,7 @@ var YouTube = {
var Links = { var Links = {
standardise: function (link) { standardise: function (link) {
link = link.replace("https://", "http://"); //cheaty way to get around http and https not matching link = link.replace("https://", "http://"); //cheaty way to get around http and https not matching
if(Config.youtubeMode) link = link.split("&")[0]; //quick way to chop off stuff like &feature=youtube etc if (Config.youtubeMode) link = link.split("&")[0]; //quick way to chop off stuff like &feature=youtube etc
return link; return link;
}, },
messageContainsLink: function (message) { messageContainsLink: function (message) {