[MediaWiki-commits] [Gerrit] wikimedia...dash[master]: Revert "Enable syslog on OSX"

2016-11-29 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Enable syslog on OSX"
..


Revert "Enable syslog on OSX"

This reverts commit 13337423c90a45a3bb5dfb3ead74b86d6f673d30.

Change-Id: Ic60dcde9054e7f059efc4ccade1b1ad226dd0a20
---
M logger.js
1 file changed, 15 insertions(+), 9 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/logger.js b/logger.js
index b0ec072..00e8a89 100644
--- a/logger.js
+++ b/logger.js
@@ -1,18 +1,24 @@
-var LOG_DEBUG = 0,
+var hasSyslog = !!process.platform.match(/linux/),
+   LOG_DEBUG = 0,
LOG_INFO = 1,   
LOG_ERR = 2,
-   syslog = require( 'modern-syslog' ),
+   syslog,
constMap = [];
 
-/*jslint bitwise: true*/
-syslog.init( 'dash', syslog.LOG_PID | syslog.LOG_ODELAY, syslog.LOG_LOCAL0 );
-/*jslint bitwise: false*/
-constMap[LOG_DEBUG] = syslog.LOG_DEBUG;
-constMap[LOG_INFO] = syslog.LOG_INFO;
-constMap[LOG_ERR] = syslog.LOG_ERR;
+if ( hasSyslog ) {
+   syslog = require( 'modern-syslog' );
+   /*jslint bitwise: true*/
+   syslog.init( 'dash', syslog.LOG_PID | syslog.LOG_ODELAY, 
syslog.LOG_LOCAL0 );
+   /*jslint bitwise: false*/
+   constMap[LOG_DEBUG] = syslog.LOG_DEBUG;
+   constMap[LOG_INFO] = syslog.LOG_INFO;
+   constMap[LOG_ERR] = syslog.LOG_ERR;
+}
 
 function log( level, message ) {
-   syslog.log( constMap[level], message );
+   if ( hasSyslog ) {
+   syslog.log( constMap[level], message );
+   }
if ( level === LOG_ERR ) {
console.error( message );
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic60dcde9054e7f059efc4ccade1b1ad226dd0a20
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...dash[master]: Revert "Enable syslog on OSX"

2016-11-29 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

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

Change subject: Revert "Enable syslog on OSX"
..

Revert "Enable syslog on OSX"

This reverts commit 13337423c90a45a3bb5dfb3ead74b86d6f673d30.

Change-Id: Ic60dcde9054e7f059efc4ccade1b1ad226dd0a20
---
M logger.js
1 file changed, 15 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/62/324262/1

diff --git a/logger.js b/logger.js
index b0ec072..00e8a89 100644
--- a/logger.js
+++ b/logger.js
@@ -1,18 +1,24 @@
-var LOG_DEBUG = 0,
+var hasSyslog = !!process.platform.match(/linux/),
+   LOG_DEBUG = 0,
LOG_INFO = 1,   
LOG_ERR = 2,
-   syslog = require( 'modern-syslog' ),
+   syslog,
constMap = [];
 
-/*jslint bitwise: true*/
-syslog.init( 'dash', syslog.LOG_PID | syslog.LOG_ODELAY, syslog.LOG_LOCAL0 );
-/*jslint bitwise: false*/
-constMap[LOG_DEBUG] = syslog.LOG_DEBUG;
-constMap[LOG_INFO] = syslog.LOG_INFO;
-constMap[LOG_ERR] = syslog.LOG_ERR;
+if ( hasSyslog ) {
+   syslog = require( 'modern-syslog' );
+   /*jslint bitwise: true*/
+   syslog.init( 'dash', syslog.LOG_PID | syslog.LOG_ODELAY, 
syslog.LOG_LOCAL0 );
+   /*jslint bitwise: false*/
+   constMap[LOG_DEBUG] = syslog.LOG_DEBUG;
+   constMap[LOG_INFO] = syslog.LOG_INFO;
+   constMap[LOG_ERR] = syslog.LOG_ERR;
+}
 
 function log( level, message ) {
-   syslog.log( constMap[level], message );
+   if ( hasSyslog ) {
+   syslog.log( constMap[level], message );
+   }
if ( level === LOG_ERR ) {
console.error( message );
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic60dcde9054e7f059efc4ccade1b1ad226dd0a20
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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