KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #229 from zoff-music/fix/errors-missing-configs

Browse Source 
Added more error-messages on crashing because of missing files.
This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-10 16:25:50 +01:00
committed by GitHub
parent 12c8ea2299 814e1eaac9
commit 9c4342c57e
5 changed files with 121 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/handlers/db.js
View File

@@ -1,5 +1,11 @@
var path = require('path');
var mongo_config = require(path.join(path.join(__dirname, '../config/'), 'mongo_config.js'));
try {
var mongo_config = require(path.join(path.join(__dirname, '../config/'), 'mongo_config.js'));
} catch(e) {
console.log("Error - missing file");
console.log("Seems you forgot to create the file mongo_config.js in /server/config/. Have a look at mongo_config.example.js.");
process.exit();
}
var mongojs = require('mongojs');
var db = mongojs(mongo_config.config);

8
server/handlers/search.js
View File

@@ -1,6 +1,12 @@
var path = require('path');
var time_regex = /P((([0-9]*\.?[0-9]*)Y)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)W)?(([0-9]*\.?[0-9]*)D)?)?(T(([0-9]*\.?[0-9]*)H)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)S)?)?/;
var key = require(path.join(__dirname, '../config/api_key.js'));
try {
var key = require(path.join(__dirname, '../config/api_key.js'));
} catch(e) {
console.log("Error - missing file");
console.log("Seems you forgot to create the file api_key.js in /server/config/. Have a look at api_key.example.js.");
process.exit();
}
function get_correct_info(song_generated, channel, broadcast) {
request({

3
server/index.js
View File

@@ -8,7 +8,7 @@ pathThumbnails = __dirname;
var express = require('express');
var app = express();
var exphbs = require('express-handlebars');
var cert_config = require(path.join(path.join(__dirname, 'config'), 'cert_config.js'));
var hbs = exphbs.create({
defaultLayout: publicPath + '/layouts/main',
layoutsDir: publicPath + '/layouts',
@@ -23,6 +23,7 @@ app.enable('view cache');
app.set('views', publicPath);
try{
var cert_config = require(path.join(path.join(__dirname, 'config'), 'cert_config.js'));
var fs = require('fs');
var privateKey = fs.readFileSync(cert_config.privateKey).toString();
var certificate = fs.readFileSync(cert_config.certificate).toString();

24
server/routing/api.js
View File

@@ -2,10 +2,14 @@ var express = require('express');
var router = express.Router();
var path = require('path');
var nodemailer = require('nodemailer');
var mailconfig = require(path.join(__dirname, '../config/mailconfig.js'));
var mongo_db_cred = {config: 'mydb'};
var mongojs = require('mongojs');
var db = mongojs(mongo_db_cred.config);
try {
var mailconfig = require(path.join(__dirname, '../config/mailconfig.js'));
} catch(e) {
console.log("Error - missing file");
console.log("Seems you forgot to create a mailconfig.js in /server/config/. Have a look at the mailconfig.example.js.");
process.exit();
}
router.use(function(req, res, next) {
next(); // make sure we go to the next routes and don't stop here
@@ -72,9 +76,9 @@ router.route('/api/conf/:channel_name').get(function(req, res) {
res.send(404);
}
});
});
});
router.route('/api/imageblob').post(function(req, res) {
router.route('/api/imageblob').post(function(req, res) {
var Jimp = require("jimp");
Jimp.read('https://img.youtube.com/vi/' + req.body.id + '/mqdefault.jpg', function (err, image) {
if (err) console.log(err);
@@ -83,10 +87,10 @@ router.route('/api/imageblob').post(function(req, res) {
res.send(req.body.id + ".jpg");
});
});
});
});
router.route('/api/mail').post(function(req, res) {
router.route('/api/mail').post(function(req, res) {
let transporter = nodemailer.createTransport(mailconfig);
transporter.verify(function(error, success) {
@@ -114,6 +118,6 @@ router.route('/api/mail').post(function(req, res) {
});
}
});
});
});
module.exports = router;
module.exports = router;

3
server/routing/router.js
View File

@@ -1,9 +1,6 @@
var express = require('express');
var router = express.Router();
var path = require('path');
var mongo_db_cred = {config: 'mydb'};
var mongojs = require('mongojs');
var db = mongojs(mongo_db_cred.config);
router.use(function(req, res, next) {
next(); // make sure we go to the next routes and don't stop here