Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-05-13 01:46:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): server error info render error

Browse Source
This commit is contained in:
OldHawk
2017-05-27 15:51:14 +08:00
parent bc318b29b1
commit 39d2431424
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/core/server/controllers/core.server.controller.js
View File

@@ -9,10 +9,8 @@ var validator = require('validator'),
* Render the main application page
*/
exports.renderIndex = function (req, res) {
var safeUserObject = null;
var safeUserObject = req.user || null;
if (req.user) {
safeUserObject = req.user;
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
req.user.addSignedIp(ip);
}
@@ -28,7 +26,12 @@ exports.renderIndex = function (req, res) {
* Render the server error page
*/
exports.renderServerError = function (req, res) {
var safeUserObject = req.user || null;
res.status(500).render('modules/core/server/views/500', {
user: JSON.stringify(safeUserObject),
sharedConfig: JSON.stringify(config.shared),
meanTorrentConfig: JSON.stringify(config.meanTorrentConfig),
error: 'Oops! Something went wrong...'
});
};
@@ -38,10 +41,14 @@ exports.renderServerError = function (req, res) {
* Performs content-negotiation on the Accept HTTP header
*/
exports.renderNotFound = function (req, res) {
var safeUserObject = req.user || null;
res.status(404).format({
'text/html': function () {
res.render('modules/core/server/views/404', {
user: JSON.stringify(safeUserObject),
sharedConfig: JSON.stringify(config.shared),
meanTorrentConfig: JSON.stringify(config.meanTorrentConfig),
url: req.originalUrl
});
},

2
modules/core/server/views/500.server.view.html
View File

@@ -4,7 +4,7 @@
<section>
<div class="container">
<div class="page-header">
<h1>Server Error</h1>
<h2>Server Error</h2>
</div>
<pre>
{{error}}