Selaa lähdekoodia

Console Logged errors instead of throwing them to prevent backend crash

theflametrooper 8 vuotta sitten
vanhempi
commit
30f480fa1b

+ 2 - 2
backend/logic/actions/queueSongs.js

@@ -34,14 +34,14 @@ module.exports = {
 	update: hooks.adminRequired((session, _id, updatedSong, cb) => {
 	update: hooks.adminRequired((session, _id, updatedSong, cb) => {
 		//TODO Check if id and updatedSong is valid
 		//TODO Check if id and updatedSong is valid
 		db.models.queueSong.findOne({ _id }, (err, currentSong) => {
 		db.models.queueSong.findOne({ _id }, (err, currentSong) => {
-			if (err) throw err;
+			if (err) console.error(err);
 			// TODO Check if new id, if any, is already in use in queue or on rotation
 			// TODO Check if new id, if any, is already in use in queue or on rotation
 			let updated = false;
 			let updated = false;
 			for (let prop in updatedSong) if (updatedSong[prop] !== currentSong[prop]) currentSong[prop] = updatedSong[prop]; updated = true;
 			for (let prop in updatedSong) if (updatedSong[prop] !== currentSong[prop]) currentSong[prop] = updatedSong[prop]; updated = true;
 			if (!updated) return cb({ status: 'error', message: 'No properties changed' });
 			if (!updated) return cb({ status: 'error', message: 'No properties changed' });
 			else {
 			else {
 				currentSong.save(err => {
 				currentSong.save(err => {
-					if (err) throw err;
+					if (err) console.error(err);
 					return cb({ status: 'success', message: 'Successfully updated the queued song' });
 					return cb({ status: 'success', message: 'Successfully updated the queued song' });
 				});
 				});
 			}
 			}

+ 4 - 4
backend/logic/actions/songs.js

@@ -55,9 +55,9 @@ module.exports = {
 
 
 	update: hooks.adminRequired((session, songId, song, cb) => {
 	update: hooks.adminRequired((session, songId, song, cb) => {
 		db.models.song.update({ _id: songId }, song, { upsert: true }, (err, updatedSong) => {
 		db.models.song.update({ _id: songId }, song, { upsert: true }, (err, updatedSong) => {
-			if (err) throw err;
+			if (err) console.error(err);
 			songs.updateSong(songId, (err, song) => {
 			songs.updateSong(songId, (err, song) => {
-				if (err) throw err;
+				if (err) console.error(err);
 				cb({ status: 'success', message: 'Song has been successfully updated', data: song });
 				cb({ status: 'success', message: 'Song has been successfully updated', data: song });
 			});
 			});
 		});
 		});
@@ -71,12 +71,12 @@ module.exports = {
 		queueSongs.remove(session, song._id, () => {
 		queueSongs.remove(session, song._id, () => {
 			const newSong = new db.models.song(song);
 			const newSong = new db.models.song(song);
 			db.models.song.findOne({ _id: song._id }, (err, existingSong) => {
 			db.models.song.findOne({ _id: song._id }, (err, existingSong) => {
-				if (err) throw err;
+				if (err) console.error(err);
 				newSong.acceptedBy = userId;
 				newSong.acceptedBy = userId;
 				newSong.acceptedAt = Date.now();
 				newSong.acceptedAt = Date.now();
 				if (!existingSong) newSong.save(err => {
 				if (!existingSong) newSong.save(err => {
 					console.log(err, 1);
 					console.log(err, 1);
-					if (err) throw err;
+					if (err) console.error(err);
 					else cb({ status: 'success', message: 'Song has been moved from Queue' })
 					else cb({ status: 'success', message: 'Song has been moved from Queue' })
 				});
 				});
 			});
 			});

+ 1 - 1
backend/logic/actions/stations.js

@@ -434,7 +434,7 @@ module.exports = {
 			}
 			}
 
 
 		], (err, station) => {
 		], (err, station) => {
-			if (err) {console.log(err); throw err;}
+			if (err) console.error(err);
 			cache.pub('station.create', data._id);
 			cache.pub('station.create', data._id);
 			return cb({ 'status': 'success', 'message': 'Successfully created station.' });
 			return cb({ 'status': 'success', 'message': 'Successfully created station.' });
 		});
 		});

+ 2 - 2
backend/logic/actions/users.js

@@ -204,7 +204,7 @@ module.exports = {
 
 
 	updateUsername: hooks.loginRequired((session, newUsername, cb, userId) => {
 	updateUsername: hooks.loginRequired((session, newUsername, cb, userId) => {
 		db.models.user.findOne({ _id: userId }, (err, user) => {
 		db.models.user.findOne({ _id: userId }, (err, user) => {
-			if (err) throw err;
+			if (err) console.error(err);
 			if (!user) return cb({ status: 'error', message: 'User not found.' });
 			if (!user) return cb({ status: 'error', message: 'User not found.' });
 			if (user.username !== newUsername) {
 			if (user.username !== newUsername) {
 				if (user.username.toLowerCase() !== newUsername.toLowerCase()) {
 				if (user.username.toLowerCase() !== newUsername.toLowerCase()) {
@@ -229,7 +229,7 @@ module.exports = {
 	updateEmail: hooks.loginRequired((session, newEmail, cb, userId) => {
 	updateEmail: hooks.loginRequired((session, newEmail, cb, userId) => {
 		newEmail = newEmail.toLowerCase();
 		newEmail = newEmail.toLowerCase();
 		db.models.user.findOne({ _id: userId }, (err, user) => {
 		db.models.user.findOne({ _id: userId }, (err, user) => {
-			if (err) throw err;
+			if (err) console.error(err);
 			if (!user) return cb({ status: 'error', message: 'User not found.' });
 			if (!user) return cb({ status: 'error', message: 'User not found.' });
 			if (user.email.address !== newEmail) {
 			if (user.email.address !== newEmail) {
 				db.models.user.findOne({"email.address": newEmail}, (err, _user) => {
 				db.models.user.findOne({"email.address": newEmail}, (err, _user) => {