[MediaWiki-commits] [Gerrit] Only log to syslog when --syslog CLI option is passed. - change (mediawiki...latex_renderer)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/108704


Change subject: Only log to syslog when --syslog CLI option is passed.
......................................................................

Only log to syslog when --syslog CLI option is passed.

This avoids spamming syslog during development.

Change-Id: I1cb2a6ac30a491192b129ab4c05f0b0694f7171a
---
M bin/mw-ocg-latexer
1 file changed, 14 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
 refs/changes/04/108704/1

diff --git a/bin/mw-ocg-latexer b/bin/mw-ocg-latexer
index 227b7ba..da49cb6 100755
--- a/bin/mw-ocg-latexer
+++ b/bin/mw-ocg-latexer
@@ -3,7 +3,6 @@
 
 var program = require('commander');
 var latexer = require('../');
-var Syslog = require('node-syslog');
 var util = require('util');
 
 program
@@ -24,7 +23,9 @@
        .option('-l, --latex',
                        'Output LaTeX source instead of PDF')
        .option('-D, --debug',
-                       'Turn on debugging features (eg, full stack traces on 
exceptions)');
+                       'Turn on debugging features (eg, full stack traces on 
exceptions)')
+       .option('--syslog',
+                       'Log errors using syslog (for production deployments)');
 
 program.parse(process.argv);
 
@@ -39,7 +40,14 @@
 
 var bundlefile = program.args[0];
 
-Syslog.init("mw-ocg-latexer", Syslog.LOG_PID | Syslog.LOG_ODELAY, 
Syslog.LOG_LOCAL0);
+var Syslog = program.syslog ? require('node-syslog') : {
+       init: function() { },
+       log: function() { },
+       close: function() { }
+};
+Syslog.init("mw-ocg-latexer", Syslog.LOG_PID | Syslog.LOG_ODELAY,
+                       Syslog.LOG_LOCAL0);
+
 var log = function() {
        // en/disable log messages here
        if (program.verbose || program.debug) {
@@ -48,7 +56,9 @@
        try {
                Syslog.log(Syslog.LOG_INFO, util.format.apply(this, arguments));
        } catch (err) {
-               Syslog.log(Syslog.LOG_ERR, "Could not format message with 
arguments " + arguments)
+               // This should never happen!  But don't try to convert arguments
+               // toString() if it does, since that might fail too.
+               Syslog.log(Syslog.LOG_ERR, "Could not format message! "+err);
        }
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/108704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cb2a6ac30a491192b129ab4c05f0b0694f7171a
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits