From 728f23a05bc874972beb220738e1490238c142ed Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Sat, 16 Feb 2013 11:23:51 -0600
Subject: [PATCH] Change behavior for MySQL fail

---
 .header.js.swp | Bin 12288 -> 0 bytes
 .server.js.swp | Bin 12288 -> 0 bytes
 auth.js        |   9 ++++++---
 channel.js     |  15 ++++++++++-----
 4 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 .header.js.swp
 delete mode 100644 .server.js.swp

diff --git a/.header.js.swp b/.header.js.swp
deleted file mode 100644
index 683e4284b1bea913ae5034daa4ab3cbe1940951c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI&K}*9h6bJCklORLUt6)@QP*~Hg2f>@v%Z3|{q4%x}ZAY7wHXGD~9{oCg0?&e9
z$%C(3y?B@dPm_P>YuY3)ZGN}XOq_?_fM41!qjJDl@OCn~=p3`xJ-YUjMXaih^(86O
znT*<5uznbOT1_Z!bTCh)GKILyb(s5U8mmzB$D$}zAdF12#5Ynz(x1xQo)y1Li*5)&
zU?YJhbGsd<8hU<q%8w53H_E~w2tWV=5P$##AOHafK;VA}n5@B`X(>DPa(3&w@uRM9
zQ9%F#5P$##AOHafKmY;|fB*y_u!REtl(FVMV?B!M|Nr;*|0mslP`p#TP>d*s6n%>2
z*ezTuUKs)qfB*y_009U<00Izz00bcLCjo8=#;Oyy=-^{1d1Op>B}9-*-^2?U=rq-;
zuyr1aBo3r1WFaPHoA$fAwo@hY+g0<F&lPQZ=U$!3y;Ul|HYSfJa}#UT9%@xJ%RGqv
tgwqW5lRcf4c^pQDcb$&Qz2yde-lBc?k6OvpS1mr!%7mIyOC~IfeF0}YWnlmS

diff --git a/.server.js.swp b/.server.js.swp
deleted file mode 100644
index e971661fc15350a79772375127d79b249b426615..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&2AGh6op;ZrA4q{gM@*_Ow`uX(ghL`E4nFvO<T$~GLDltov{adl2BEJ4R64+
z@C>{I4+2}R69)>5(k*Z-9o?~g?!BIGHyXd*e6{<WKM>oD#x=%vmT&Lh+`7d!a>kS_
zC&tE&i${4<jr4G%Ru|jYyLrK4$Ek6pZ4-))cLOi0%Gg2i<gf@QRuzq|>QXkk2-;7y
z7o+fpve*Uz5V#b9t8DxJ)@HQcyL*S<xPEl0ESNw51V8`;KmY_l00ck)1pW;IO})h4
z)2m!bud|%u(r+<M5kLS0KmY_l00ck)1V8`;KmY_l00jO*0<uSkUSaGRDgOUoeE)x0
zW$Y8_Bk3V&m9#?oM!v74&!i8e4k_k7C1HR72!H?xfB*=900@8p2!H?x{2v6)T5ZN@
zC})E!wJ6;n&tB+hT(DX-##!F?uHr?;*Z7$3cMDUeoQd?a75<1@$~dCUJUDf%n{_^q
zVkm7d4CS#Fve)xEghiwh#)-Kr2xs%`XTxlr_s4eDJJoCPQ^xe$+W963MMbSH1GPOp
zYcm#)VI0l8els>+=UHlQT-Fk$35~Y7tmCPpm7d6(x(Veq-CIALU0cr=i=mN?QF*u9
zGv3NduVuw_I?Y-?sy%kLZw6v_uiM!>c$o^P?DGdnOIdQv)6N@2L6%r*6c(n4@mI@?
LdNhc**Jj@V0PVg@

diff --git a/auth.js b/auth.js
index 2fa64de7..55f7a476 100644
--- a/auth.js
+++ b/auth.js
@@ -15,7 +15,8 @@ exports.isRegistered = function(name) {
     db.connectSync(Config.MYSQL_SERVER, Config.MYSQL_USER,
                    Config.MYSQL_PASSWORD, Config.MYSQL_DB);
     if(!db.connectedSync()) {
-        throw "[](/abchaos) MySQL Connection Failed";
+        console.log("MySQL Connection Failed");
+        return true;
     }
     var query = 'SELECT * FROM registrations WHERE uname="{}"'
         .replace(/\{\}/, name);
@@ -44,7 +45,8 @@ exports.register = function(name, sha256) {
     db.connectSync(Config.MYSQL_SERVER, Config.MYSQL_USER,
                    Config.MYSQL_PASSWORD, Config.MYSQL_DB);
     if(!db.connectedSync()) {
-        throw "[](/abchaos) MySQL Connection Failed";
+        console.log("MySQL Connection Failed");
+        return false;
     }
     var query = 'INSERT INTO registrations VALUES (NULL, "{1}", "{2}", 0)'
         .replace(/\{1\}/, name)
@@ -60,7 +62,8 @@ exports.login = function(name, sha256) {
     db.connectSync(Config.MYSQL_SERVER, Config.MYSQL_USER,
                    Config.MYSQL_PASSWORD, Config.MYSQL_DB);
     if(!db.connectedSync()) {
-        throw "[](/abchaos) MySQL Connection Failed";
+        console.log("MySQL Connection Failed");
+        return false;
     }
     var query = 'SELECT * FROM registrations WHERE uname="{1}" AND pw="{2}"'
         .replace(/\{1\}/, name)
diff --git a/channel.js b/channel.js
index 70682436..742234e4 100644
--- a/channel.js
+++ b/channel.js
@@ -35,7 +35,8 @@ Channel.prototype.loadMysql = function() {
     db.connectSync(Config.MYSQL_SERVER, Config.MYSQL_USER,
                    Config.MYSQL_PASSWORD, Config.MYSQL_DB);
     if(!db.connectedSync()) {
-        throw "[](/abchaos) MySQL Connection Failed";
+        console.log("MySQL Connection Failed");
+        return false;
     }
     // Check if channel exists
     var query = 'SELECT * FROM channels WHERE name="{}"'
@@ -67,7 +68,8 @@ Channel.prototype.createTables = function() {
     db.connectSync(Config.MYSQL_SERVER, Config.MYSQL_USER,
                    Config.MYSQL_PASSWORD, Config.MYSQL_DB);
     if(!db.connectedSync()) {
-        throw "[](/abchaos) MySQL Connection Failed";
+        console.log("MySQL Connection Failed");
+        return false;
     }
     // Create library table
     var query= "CREATE TABLE `chan_{}_library` \
@@ -107,7 +109,8 @@ Channel.prototype.getRank = function(name) {
     db.connectSync(Config.MYSQL_SERVER, Config.MYSQL_USER,
                    Config.MYSQL_PASSWORD, Config.MYSQL_DB);
     if(!db.connectedSync()) {
-        throw "[](/abchaos) MySQL Connection Failed";
+        console.log("MySQL Connection Failed");
+        return Rank.Guest;
     }
     var query = 'SELECT * FROM chan_{1}_ranks WHERE name="{2}"'
         .replace(/\{1\}/, this.name)
@@ -130,7 +133,8 @@ Channel.prototype.saveRank = function(user) {
     db.connectSync(Config.MYSQL_SERVER, Config.MYSQL_USER,
                    Config.MYSQL_PASSWORD, Config.MYSQL_DB);
     if(!db.connectedSync()) {
-        throw "[](/abchaos) MySQL Connection Failed";
+        console.log("MySQL Connection Failed");
+        return false;
     }
     var query = 'UPDATE chan_{1}_ranks SET rank={2} WHERE name={3}'
         .replace(/\{1\}/, this.name)
@@ -159,7 +163,8 @@ Channel.prototype.addToLibrary = function(media) {
     db.connectSync(Config.MYSQL_SERVER, Config.MYSQL_USER,
                    Config.MYSQL_PASSWORD, Config.MYSQL_DB);
     if(!db.connectedSync()) {
-        throw "[](/abchaos) MySQL Connection Failed";
+        console.log("MySQL Connection Failed");
+        return false;
     }
     var query = 'INSERT INTO chan_{1}_library VALUES ("{2}", "{3}", {4}, "{5}", "{6}")'
         .replace(/\{1\}/, this.name)