[MediaWiki-commits] [Gerrit] Move logging into separate module - change (wikimedia...dash)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Move logging into separate module
......................................................................

Move logging into separate module

Change-Id: I4cfdfb63438821d977a6776593f6e7e59ef08506
---
A logger.js
M node_modules
M server.js
3 files changed, 35 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/09/168609/1

diff --git a/logger.js b/logger.js
new file mode 100644
index 0000000..43d8674
--- /dev/null
+++ b/logger.js
@@ -0,0 +1,24 @@
+var syslog = require( 'node-syslog' );
+
+syslog.init( 'dash', syslog.LOG_PID | syslog.LOG_ODELAY, syslog.LOG_LOCAL0 );
+
+function log( level, message ) {
+       syslog.log( level, message );
+       if ( level === syslog.LOG_ERR ) {
+               console.error( message );
+       } else {
+               console.log( message );
+       }
+}
+
+module.exports = {
+       error: function( message ) {
+               log( syslog.LOG_ERR, message );
+       },
+       debug: function( message ) {
+               log( syslog.LOG_DEBUG, message );
+       },
+       info: function( message ) {
+               log( syslog.LOG_INFO, message )
+       }
+};
diff --git a/node_modules b/node_modules
index bc28383..8a9f164 160000
--- a/node_modules
+++ b/node_modules
-Subproject commit bc283830cac9628533227c08e0fbaeed0e0e1b1b
+Subproject commit 8a9f1643c3b14544988984a2823e5dbd73f0cceb
diff --git a/server.js b/server.js
index 68f78e2..a4f866d 100644
--- a/server.js
+++ b/server.js
@@ -6,8 +6,8 @@
     passport          = require( 'passport' ),
     DrupalStrategy    = require( 'passport-drupal' ).DrupalStrategy,
     evilDns                      = require( 'evil-dns' ),
-    syslog            = require( 'node-syslog' ),
     url               = require( 'url' ),
+    logger            = require( './logger.js' ),
     server,
     serverConfig,
     config,
@@ -18,22 +18,11 @@
     .option('-c, --config <path>', 'Path to the local configuration file')
     .parse(process.argv);
 
-syslog.init( 'dash', syslog.LOG_PID | syslog.LOG_ODELAY, syslog.LOG_LOCAL0 );
-
-function log( level, message ) {
-       syslog.log( level, message );
-       if ( level === syslog.LOG_ERR ) {
-               console.error( message );
-       } else {
-               console.log( message );
-       }
-}
-
-log( syslog.LOG_DEBUG, 'Dash starting up' );
+logger.debug( 'Dash starting up' );
 
 // Log errors
 process.on( 'uncaughtException', function( err ) {
-       log( syslog.LOG_ERR, 'Application error: ' + err );
+       logger.error( 'Application error: ' + err );
 });
 
 try {
@@ -48,22 +37,24 @@
                config = defaults;
        }
 } catch(err) {
-    log( syslog.LOG_ERR, 'Could not open configuration file ' + 
commander.config + '! ' + err );
+    logger.error( 'Could not open configuration file ' + commander.config + '! 
' + err );
     process.exit(1);
 }
 
 serverConfig = /(([0-9\.]*|\[[0-9a-fA-F\:]*\]):)?([0-9]+)/.exec(config.listen);
 if (!serverConfig) {
-    log( syslog.LOG_ERR, 'Server cannot listen on "' + config.listen + '", 
invalid format.' );
+    logger.error( 'Server cannot listen on "' + config.listen + '", invalid 
format.' );
     process.exit(1);
 }
 
-log( syslog.LOG_DEBUG, 'Will try to listen on IP address: ' + serverConfig[2] 
);
-log( syslog.LOG_DEBUG, 'Will try to listen on port: ' + serverConfig[3] );
+logger.debug( 'Will try to listen on IP address: ' + serverConfig[2] );
+logger.debug( 'Will try to listen on port: ' + serverConfig[3] );
+logger.debug( 'Using OAuth providerURL: ' + config.providerURL );
+logger.debug( 'Using OAuth providerBackendURL: ' + config.providerBackendURL );
 
 // Override DNS resolution if providerBackendIP is given
 if ( config.providerBackendIP ) {
-       log( syslog.LOG_INFO, 'providerBackendIP set, will use address '
+       logger.info( 'OAuth providerBackendIP set, will use address '
                + config.providerBackendIP + ' for hostname "'
                + url.parse( config.providerBackendURL ).hostname + '"' );
        evilDns.add(
@@ -118,6 +109,6 @@
                serverConfig[3],
                serverConfig[2],
                function() {
-                       log( syslog.LOG_INFO, 'Dash listening on port ' + 
server.address().port );
+                       logger.info( 'Dash listening on port ' + 
server.address().port );
                }
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cfdfb63438821d977a6776593f6e7e59ef08506
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>

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