From 80489c6564f2a17da4c04006822581e92953591d Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 15 Oct 2014 15:57:37 -0400 Subject: [PATCH 1/3] log post purges --- src/events.js | 4 ++++ src/postTools.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/events.js b/src/events.js index 37e43f3d01..d24c6aec4f 100644 --- a/src/events.js +++ b/src/events.js @@ -62,6 +62,10 @@ var fs = require('fs'), events.logWithUser(uid, 'restored post (pid ' + pid + ')'); }; + events.logPostPurge = function(uid, pid) { + events.logWithUser(uid, 'purged post (pid ' + pid + ')'); + }; + events.logTopicMove = function(uid, tid) { events.logWithUser(uid, 'moved topic (tid ' + tid + ')'); }; diff --git a/src/postTools.js b/src/postTools.js index 009d4bde56..4e6206ac34 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -166,7 +166,7 @@ var winston = require('winston'), if (err || !canEdit) { return callback(err || new Error('[[error:no-privileges]]')); } - + events.logPostPurge(uid, pid); posts.purge(pid, callback); }); }; From 834c4f8ff019b570dca48cb54aa09776ab43ac9a Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 15 Oct 2014 16:19:27 -0400 Subject: [PATCH 2/3] log stack --- app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index ac339fedc3..3b02134831 100644 --- a/app.js +++ b/app.js @@ -171,9 +171,9 @@ function start() { break; } }); - + process.on('uncaughtException', function(err) { - winston.error(err.message); + winston.error(err.stack); console.log(err.stack); meta.js.killMinifier(); From eb546dfaab042680a9ce34d6e5f4e8882bc2ce15 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 15 Oct 2014 16:26:50 -0400 Subject: [PATCH 3/3] temp until package manager is in place --- src/plugins.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index df03b776cf..ef8078b5c1 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -660,8 +660,8 @@ var fs = require('fs'), pluginMap[plugin.name].version = plugin.version; getVersion(plugin.id, function(err, version) { - pluginMap[plugin.name].latest = version; - pluginMap[plugin.name].outdated = version !== pluginMap[plugin.name].version; + pluginMap[plugin.name].latest = version || plugin.version; + pluginMap[plugin.name].outdated = pluginMap[plugin.name].latest !== pluginMap[plugin.name].version; next(); }); }, function(err) { @@ -697,10 +697,10 @@ var fs = require('fs'), npm.load({}, function() { npm.commands.show([name, 'version'], true, function(err, version) { if (err || !version) { - return callback(null, 'no version'); + return callback(); } var obj = Object.keys(version); - callback(null, Array.isArray(obj) && obj.length ? obj[0] : 'no version'); + callback(null, Array.isArray(obj) && obj.length ? obj[0] : null); }); }); }