hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into email-revamp

Browse Source
v1.18.x
Julian Lam 11 years ago
parent 24944762d7 e45e86fcc1
commit cdb0b4b49e
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File

54
public/templates/admin/header.tpl
Unescape Escape View File

@ -95,31 +95,29 @@
<div class="well sidebar-nav"> <div class="well sidebar-nav">
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header">NodeBB</li> <li class="nav-header">NodeBB</li>
<li class='active'> <li class="active"><a href="{relative_path}/admin/index"><i class="fa fa-fw fa-home"></i> Home</a></li>
<a href='{relative_path}/admin/index'><i class='fa fa-home'></i> Home</a> <li><a href="{relative_path}/admin/categories/active"><i class="fa fa-fw fa-folder"></i> Categories</a></li>
</li> <li><a href="{relative_path}/admin/users/latest"><i class="fa fa-fw fa-user"></i> Users</a></li>
<li><a href='{relative_path}/admin/categories/active'><i class='fa fa-folder'></i> Categories</a></li> <li><a href="{relative_path}/admin/groups"><i class="fa fa-fw fa-group"></i> Groups</a></li>
<li><a href='{relative_path}/admin/users/latest'><i class='fa fa-user'></i> Users</a></li> <li><a href="{relative_path}/admin/topics"><i class="fa fa-fw fa-book"></i> Topics</a></li>
<li><a href="{relative_path}/admin/groups"><i class="fa fa-group"></i> Groups</a></li> <li><a href="{relative_path}/admin/themes"><i class="fa fa-fw fa-th"></i> Themes</a></li>
<li><a href='{relative_path}/admin/topics'><i class='fa fa-book'></i> Topics</a></li> <li><a href="{relative_path}/admin/plugins"><i class="fa fa-fw fa-code-fork"></i> Plugins</a></li>
<li><a href='{relative_path}/admin/themes'><i class='fa fa-th'></i> Themes</a></li> <li><a href="{relative_path}/admin/settings"><i class="fa fa-fw fa-cogs"></i> Settings</a></li>
<li><a href='{relative_path}/admin/plugins'><i class='fa fa-code-fork'></i> Plugins</a></li> <li><a href="{relative_path}/admin/database"><i class="fa fa-fw fa-hdd-o"></i> Database</a></li>
<li><a href='{relative_path}/admin/settings'><i class='fa fa-cogs'></i> Settings</a></li> <li><a href="{relative_path}/admin/logger"><i class="fa fa-fw fa-th"></i> Logger</a></li>
<li><a href='{relative_path}/admin/database'><i class='fa fa-hdd-o'></i> Database</a></li> <li><a href="{relative_path}/admin/motd"><i class="fa fa-fw fa-comment"></i> MOTD</a></li>
<li><a href='{relative_path}/admin/logger'><i class='fa fa-th'></i> Logger</a></li> <li><a href="{relative_path}/admin/events"><i class="fa fa-fw fa-calendar-o"></i> Events</a></li>
<li><a href="{relative_path}/admin/motd"><i class="fa fa-comment"></i> MOTD</a></li>
<li><a href="{relative_path}/admin/events"><i class="fa fa-calendar-o"></i> Events</a></li>
</ul> </ul>
</div> </div>
<div class="well sidebar-nav"> <div class="well sidebar-nav">
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header">Social Authentication</li> <li class="nav-header">Social Authentication</li>
<li><a href='{relative_path}/admin/twitter'><i class='fa fa-twitter-square'></i> Twitter</a></li> <li><a href="{relative_path}/admin/twitter"><i class="fa fa-fw fa-twitter-square"></i> Twitter</a></li>
<li><a href='{relative_path}/admin/facebook'><i class='fa fa-facebook-square'></i> Facebook</a></li> <li><a href="{relative_path}/admin/facebook"><i class="fa fa-fw fa-facebook-square"></i> Facebook</a></li>
<li><a href='{relative_path}/admin/gplus'><i class='fa fa-google-plus-square'></i> Google+</a></li> <li><a href="{relative_path}/admin/gplus"><i class="fa fa-fw fa-google-plus-square"></i> Google+</a></li>
<!-- BEGIN authentication --> <!-- BEGIN authentication -->
<li> <li>
<a href='{relative_path}/admin{authentication.route}'><i class="fa {authentication.icon}"></i> {authentication.name}</a> <a href="{relative_path}/admin{authentication.route}"><i class="fa fa-fw {authentication.icon}"></i> {authentication.name}</a>
</li> </li>
<!-- END authentication --> <!-- END authentication -->
</ul> </ul>
@ -129,7 +127,7 @@
<li class="nav-header">Plugins</li> <li class="nav-header">Plugins</li>
<!-- BEGIN plugins --> <!-- BEGIN plugins -->
<li> <li>
<a href='{relative_path}/admin{plugins.route}'><i class="fa {plugins.icon}"></i> {plugins.name}</a> <a href="{relative_path}/admin{plugins.route}"><i class="fa fa-fw {plugins.icon}"></i> {plugins.name}</a>
</li> </li>
<!-- END plugins --> <!-- END plugins -->
</ul> </ul>
@ -138,15 +136,15 @@
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header">Unit Tests</li> <li class="nav-header">Unit Tests</li>
<ul class="nav nav-list"> <ul class="nav nav-list">
<li><a href='{relative_path}/admin/testing/categories'>Categories</a></li> <li><a href="{relative_path}/admin/testing/categories">Categories</a></li>
<!--<li><a href='{relative_path}/admin/testing/topics'>Topics</a></li> <!--<li><a href="{relative_path}/admin/testing/topics">Topics</a></li>
<li><a href='{relative_path}/admin/testing/posts'>Posts</a></li> <li><a href="{relative_path}/admin/testing/posts">Posts</a></li>
<li><a href='{relative_path}/admin/testing/accounts'>Accounts</a></li> <li><a href="{relative_path}/admin/testing/accounts">Accounts</a></li>
<li><a href='{relative_path}/admin/testing/chat'>Chat</a></li> <li><a href="{relative_path}/admin/testing/chat">Chat</a></li>
<li><a href='{relative_path}/admin/testing/notifications'>Notifications</a></li> <li><a href="{relative_path}/admin/testing/notifications">Notifications</a></li>
<li><a href='{relative_path}/admin/testing/friends'>Friends</a></li> <li><a href="{relative_path}/admin/testing/friends">Friends</a></li>
<li><a href='{relative_path}/admin/testing/feed'>RSS Feed</a></li> <li><a href="{relative_path}/admin/testing/feed">RSS Feed</a></li>
<li><a href='{relative_path}/admin/testing/emails'>Emails</a></li>--> <li><a href="{relative_path}/admin/testing/emails">Emails</a></li>-->
</ul> </ul>
</ul> </ul>
</div><!--/.well --> </div><!--/.well -->

27
src/logger.js
Unescape Escape View File

@ -72,18 +72,26 @@ var opts = {
Logger.open = function(value) { Logger.open = function(value) {
/* Open the streams to log to: either a path or stdout */ /* Open the streams to log to: either a path or stdout */
var stream; var stream;
if(value && fs.existsSync(value)) { if(value) {
fs.stat(value, function(err, stats) { if(fs.existsSync(value)) {
if(stats.isDirectory()) { stats = fs.statSync(value);
stream = fs.createWriteStream(path.join(value, 'nodebb.log'), {flags: 'a'}); if(stats) {
} else { if(stats.isDirectory()) {
stream = fs.createWriteStream(value, {flags: 'a'}); stream = fs.createWriteStream(path.join(value, 'nodebb.log'), {flags: 'a'});
} else {
stream = fs.createWriteStream(value, {flags: 'a'});
}
} }
} else {
stream = fs.createWriteStream(value, {flags: 'a'});
}
if(stream) {
stream.on('error', function(err) { stream.on('error', function(err) {
winston.error(err.message); winston.error(err.message);
}); });
}); }
} else { } else {
stream = process.stdout; stream = process.stdout;
} }
@ -189,8 +197,9 @@ var opts = {
var emit = socket.emit; var emit = socket.emit;
socket.emit = function() { socket.emit = function() {
if(opts.streams.log.f != null) { if(opts.streams.log.f != null) {
opts.streams.log.f.write(Logger.prepare_io_string("emit",uid,arguments)); opts.streams.log.f.write(Logger.prepare_io_string("emit", uid, arguments));
} }
try { try {
emit.apply(socket, arguments); emit.apply(socket, arguments);
} catch(err) { } catch(err) {

Write Preview
Loading…
Cancel
Save