@ -59,9 +59,9 @@ var opts = {
* If logging is currently enabled , create a stream .
* If logging is currently enabled , create a stream .
* Otherwise , close the current stream
* Otherwise , close the current stream
* /
* /
if ( meta . config . loggerStatus > 0 || meta . config . loggerIOStatus ) {
if ( meta . config . loggerStatus > 0 || meta . config . loggerIOStatus ) {
var stream = Logger . open ( value ) ;
var stream = Logger . open ( value ) ;
if ( stream ) {
if ( stream ) {
opts . streams . log . f = stream ;
opts . streams . log . f = stream ;
} else {
} else {
opts . streams . log . f = process . stdout ;
opts . streams . log . f = process . stdout ;
@ -74,11 +74,11 @@ var opts = {
Logger . open = function ( value ) {
Logger . open = function ( value ) {
/* Open the streams to log to: either a path or stdout */
/* Open the streams to log to: either a path or stdout */
var stream ;
var stream ;
if ( value ) {
if ( value ) {
if ( file . existsSync ( value ) ) {
if ( file . existsSync ( value ) ) {
var stats = fs . statSync ( value ) ;
var stats = fs . statSync ( value ) ;
if ( stats ) {
if ( stats ) {
if ( stats . isDirectory ( ) ) {
if ( stats . isDirectory ( ) ) {
stream = fs . createWriteStream ( path . join ( value , 'nodebb.log' ) , { flags : 'a' } ) ;
stream = fs . createWriteStream ( path . join ( value , 'nodebb.log' ) , { flags : 'a' } ) ;
} else {
} else {
stream = fs . createWriteStream ( value , { flags : 'a' } ) ;
stream = fs . createWriteStream ( value , { flags : 'a' } ) ;
@ -89,7 +89,7 @@ var opts = {
}
}
if ( stream ) {
if ( stream ) {
stream . on ( 'error' , function ( err ) {
stream . on ( 'error' , function ( err ) {
winston . error ( err . message ) ;
winston . error ( err . message ) ;
} ) ;
} ) ;
@ -101,7 +101,7 @@ var opts = {
} ;
} ;
Logger . close = function ( stream ) {
Logger . close = function ( stream ) {
if ( stream . f !== process . stdout && stream . f ) {
if ( stream . f !== process . stdout && stream . f ) {
stream . end ( ) ;
stream . end ( ) ;
}
}
stream . f = null ;
stream . f = null ;
@ -117,7 +117,7 @@ var opts = {
} ;
} ;
Logger . express _open = function ( ) {
Logger . express _open = function ( ) {
if ( opts . express . set !== 1 ) {
if ( opts . express . set !== 1 ) {
opts . express . set = 1 ;
opts . express . set = 1 ;
opts . express . app . use ( Logger . expressLogger ) ;
opts . express . app . use ( Logger . expressLogger ) ;
}
}
@ -133,7 +133,7 @@ var opts = {
*
*
* This hijack allows us to turn logger on / off dynamically within express
* This hijack allows us to turn logger on / off dynamically within express
* /
* /
if ( meta . config . loggerStatus > 0 ) {
if ( meta . config . loggerStatus > 0 ) {
return opts . express . ofn ( req , res , next ) ;
return opts . express . ofn ( req , res , next ) ;
} else {
} else {
return next ( ) ;
return next ( ) ;
@ -148,7 +148,7 @@ var opts = {
* /
* /
try {
try {
return 'io: ' + _uid + ' ' + _type + ' ' + util . inspect ( Array . prototype . slice . call ( _args ) ) + '\n' ;
return 'io: ' + _uid + ' ' + _type + ' ' + util . inspect ( Array . prototype . slice . call ( _args ) ) + '\n' ;
} catch ( err ) {
} catch ( err ) {
winston . info ( "Logger.prepare_io_string: Failed" , err ) ;
winston . info ( "Logger.prepare_io_string: Failed" , err ) ;
return "error" ;
return "error" ;
}
}
@ -165,11 +165,11 @@ var opts = {
for ( var sid in clients ) {
for ( var sid in clients ) {
if ( clients . hasOwnProperty ( sid ) ) {
if ( clients . hasOwnProperty ( sid ) ) {
var client = clients [ sid ] ;
var client = clients [ sid ] ;
if ( client . oEmit && client . oEmit !== client . emit ) {
if ( client . oEmit && client . oEmit !== client . emit ) {
client . emit = client . oEmit ;
client . emit = client . oEmit ;
}
}
if ( client . $oEmit && client . $oEmit !== client . $emit ) {
if ( client . $oEmit && client . $oEmit !== client . $emit ) {
client . $emit = client . $oEmit ;
client . $emit = client . $oEmit ;
}
}
}
}
@ -186,7 +186,7 @@ var opts = {
}
}
var clients = socket . io . sockets . sockets ;
var clients = socket . io . sockets . sockets ;
for ( var sid in clients ) {
for ( var sid in clients ) {
if ( clients . hasOwnProperty ( sid ) ) {
if ( clients . hasOwnProperty ( sid ) ) {
Logger . io _one ( clients [ sid ] , clients [ sid ] . uid ) ;
Logger . io _one ( clients [ sid ] , clients [ sid ] . uid ) ;
}
}
@ -199,13 +199,13 @@ var opts = {
* /
* /
function override ( method , name , errorMsg ) {
function override ( method , name , errorMsg ) {
return function ( ) {
return function ( ) {
if ( opts . streams . log . f ) {
if ( opts . streams . log . f ) {
opts . streams . log . f . write ( Logger . prepare _io _string ( name , uid , arguments ) ) ;
opts . streams . log . f . write ( Logger . prepare _io _string ( name , uid , arguments ) ) ;
}
}
try {
try {
method . apply ( socket , arguments ) ;
method . apply ( socket , arguments ) ;
} catch ( err ) {
} catch ( err ) {
winston . info ( errorMsg , err ) ;
winston . info ( errorMsg , err ) ;
}
}
} ;
} ;
Peter Jaszkowiak
8 years ago