Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 05:55:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-02-24 12:46:40 -05:00
parent c09f994b0a 995f8296a4
commit 72e77772db
449 changed files with 9202 additions and 6984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/socket.io/admin.js
View File

@@ -1,4 +1,4 @@
"use strict";
'use strict';
var async = require('async');
var winston = require('winston');
@@ -33,7 +33,7 @@ var SocketAdmin = {
email: {},
analytics: {},
logs: {},
errors: {}
errors: {},
};
SocketAdmin.before = function (socket, method, data, next) {
@@ -50,7 +50,7 @@ SocketAdmin.reload = function (socket, data, callback) {
events.log({
type: 'restart',
uid: socket.uid,
ip: socket.ip
ip: socket.ip,
});
meta.restart();
callback();
@@ -65,13 +65,13 @@ SocketAdmin.restart = function (socket, data, callback) {
events.log({
type: 'build',
uid: socket.uid,
ip: socket.ip
ip: socket.ip,
});
events.log({
type: 'restart',
uid: socket.uid,
ip: socket.ip
ip: socket.ip,
});
meta.restart();
@@ -166,15 +166,15 @@ SocketAdmin.config.setMultiple = function (socket, data, callback) {
if (data.hasOwnProperty(field)) {
setting = {
key: field,
value: data[field]
value: data[field],
};
logger.monitorConfig({io: index.server}, setting);
plugins.fireHook('action:config.set', setting);
logger.monitorConfig({ io: index.server }, setting);
}
}
plugins.fireHook('action:config.set', {settings: data});
plugins.fireHook('action:config.set', { settings: data });
setImmediate(next);
}
},
], callback);
};
@@ -200,7 +200,7 @@ SocketAdmin.email.test = function (socket, data, callback) {
emailer.send(data.template, socket.uid, {
subject: '[' + site_title + '] Test Email',
site_title: site_title,
url: nconf.get('url')
url: nconf.get('url'),
}, callback);
};
@@ -231,9 +231,9 @@ SocketAdmin.analytics.get = function (socket, data, callback) {
},
monthlyPageViews: function (next) {
analytics.getMonthlyPageViews(next);
}
},
}, function (err, data) {
data.pastDay = data.pageviews.reduce(function (a, b) {return parseInt(a, 10) + parseInt(b, 10);});
data.pastDay = data.pageviews.reduce(function (a, b) { return parseInt(a, 10) + parseInt(b, 10); });
data.pageviews[data.pageviews.length - 1] = parseInt(data.pageviews[data.pageviews.length - 1], 10) + analytics.getUnwrittenPageviews();
callback(err, data);
});