From aff8cef5f3c8ac89f91d6138f6fc769e2a788bc9 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Thu, 2 Jan 2014 15:59:25 -0500 Subject: [PATCH 1/4] closes #717 --- src/logger.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/logger.js b/src/logger.js index 6ee2775255..4b63817f20 100644 --- a/src/logger.js +++ b/src/logger.js @@ -32,6 +32,7 @@ var opts = { Logger.init = function(app) { opts.express.app = app; + console.log(meta.config); /* Open log file stream & initialize express logging if meta.config.logger* variables are set */ Logger.setup(); } @@ -65,6 +66,7 @@ var opts = { else opts.streams.log.f = process.stdout; } else { + console.log('CLOSING'); Logger.close(opts.streams.log); } } @@ -72,18 +74,26 @@ var opts = { Logger.open = function(value) { /* Open the streams to log to: either a path or stdout */ var stream; - if(value && fs.existsSync(value)) { - fs.stat(value, function(err, stats) { - if(stats.isDirectory()) { - stream = fs.createWriteStream(path.join(value, 'nodebb.log'), {flags: 'a'}); - } else { - stream = fs.createWriteStream(value, {flags: 'a'}); + if(value) { + if(fs.existsSync(value)) { + stats = fs.statSync(value); + if(stats) { + if(stats.isDirectory()) { + 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) { winston.error(err.message); }); - }); - + } } else { stream = process.stdout; } @@ -189,8 +199,9 @@ var opts = { var emit = socket.emit; socket.emit = function() { 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 { emit.apply(socket, arguments); } catch(err) { From 91afbf106e3ed3bb9b31ba48aac38bab08b9068b Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Thu, 2 Jan 2014 16:00:05 -0500 Subject: [PATCH 2/4] removed console.log --- src/logger.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/logger.js b/src/logger.js index 4b63817f20..49b49ff52b 100644 --- a/src/logger.js +++ b/src/logger.js @@ -32,7 +32,6 @@ var opts = { Logger.init = function(app) { opts.express.app = app; - console.log(meta.config); /* Open log file stream & initialize express logging if meta.config.logger* variables are set */ Logger.setup(); } From 9589d340b9df8885a9db9ec27f449059d9f68951 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Thu, 2 Jan 2014 16:00:24 -0500 Subject: [PATCH 3/4] removed console.log --- src/logger.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/logger.js b/src/logger.js index 49b49ff52b..1a106e1efc 100644 --- a/src/logger.js +++ b/src/logger.js @@ -65,7 +65,6 @@ var opts = { else opts.streams.log.f = process.stdout; } else { - console.log('CLOSING'); Logger.close(opts.streams.log); } } From e45e86fcc1c5b7f422643fb83beda800d29de19a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 2 Jan 2014 18:12:59 -0500 Subject: [PATCH 4/4] fixed width icons in ACP. Also, who uses single quotes in HTML? ARGH --- public/templates/admin/header.tpl | 54 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl index f1988b9f21..b468df62ea 100644 --- a/public/templates/admin/header.tpl +++ b/public/templates/admin/header.tpl @@ -95,31 +95,29 @@
@@ -129,7 +127,7 @@
  • Plugins
  • - {plugins.name} + {plugins.name}
    • @@ -138,15 +136,15 @@