From b782ad72cbabcded6fbfa9ae926dd2928c5b2e4a Mon Sep 17 00:00:00 2001 From: Walamana Date: Sun, 26 Nov 2017 19:08:39 +0100 Subject: [PATCH] Bypass disconnected Signed-off-by: Walamana --- app.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 357e340..70933a0 100644 --- a/app.js +++ b/app.js @@ -17,17 +17,18 @@ var con = mysql.createConnection({ con.connect(err => { if (err) { console.log("Cant connect to MySQL database"); - throw err; } console.log("Connected to database!"); }); app.get('/', (req, res) => { + if(!isConnected()){res.send("No Connection to database");return} res.send("Welcome to the miniplan api!"); }); app.get('/login', (req, res) => { + if(!isConnected()){res.send("No Connection to database");return} var username = req.query.username; var password = req.query.password; @@ -59,11 +60,12 @@ app.get('/login', (req, res) => { }); app.get("/user/:user/update", (req, res) => { - + if(!isConnected()){res.send("No Connection to database");return} }); app.get("/gottesdienste", (req, res) => { + if(!isConnected()){res.send("No Connection to database");return} var groupid = req.params.groupid; con.query("SELECT ID from gottesdienstgruppe ORDER BY ID DESC LIMIT 1", (err, result) => { if (err) throw err; @@ -76,6 +78,7 @@ app.get("/gottesdienste", (req, res) => { }); app.get("/gottesdienste/:groupid", (req, res) => { + if(!isConnected()){res.send("No Connection to database");return} var groupid = req.params.groupid; con.query("SELECT * from gottesdienste WHERE GruppeID='" + groupid + "' ORDER BY `gottesdienste`.`Datum` ASC LIMIT 0 , 30", (err, result) => { if (err) throw err; @@ -91,6 +94,7 @@ app.get("/groups", (req, res) => { }); app.get("/ministranten", (req, res) =>{ + if(!isConnected()){res.send("No Connection to database");return} con.query("SELECT UserToken FROM ministranten WHERE UserToken='" + req.cookies.loginToken + "'", (err, result) => { var loggedIn = result.length == 1; @@ -135,6 +139,14 @@ app.listen(3000, () => { }); +function isConnected(){ + if(con.isConnected){ + return true; + }else{ + return false; + } +} + function removeFromArrayByValue(value, array) { var index = array.indexOf(value);