Development

Changeset 7452

You must first sign up to be able to contribute.

Changeset 7452

Show
Ignore:
Timestamp:
02/10/08 18:38:21 (8 months ago)
Author:
fabien
Message:

added sfStreamLogger

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/autoload/sfCoreAutoload.class.php

    r7434 r7452  
    255255  'sfLoggerWrapper' => 'log', 
    256256  'sfNoLogger' => 'log', 
     257  'sfStreamLogger' => 'log', 
    257258  'sfWebDebugLogger' => 'log', 
    258259  'sfPearDownloader' => 'plugin', 

  • branches/1.1/lib/log/sfConsoleLogger.class.php

    r7450 r7452  
    1717 * @version    SVN: $Id$ 
    1818 */ 
    19 class sfConsoleLogger extends sfLogger 
     19class sfConsoleLogger extends sfStreamLogger 
    2020{ 
    2121  /** 
    22    * Logs a message. 
    23    * 
    24    * @param string Message 
    25    * @param string Message priority 
     22   * @see sfStreamLogger 
    2623   */ 
    27   protected function doLog($message, $priority) 
     24  public function initialize(sfEventDispatcher $dispatcher, $options = array()) 
    2825  { 
    29     fwrite(STDOUT, $message.PHP_EOL); 
    30     flush(); 
     26    $options['stream'] = STDOUT; 
     27 
     28    return parent::initialize($dispatcher, $options); 
    3129  } 
    3230} 

  • branches/1.1/test/unit/log/sfAggregateLoggerTest.php

    r6380 r7452  
    2222} 
    2323$fileLogger = new sfFileLogger($dispatcher, array('file' => $file)); 
    24 $consoleLogger = new sfConsoleLogger($dispatcher); 
     24$buffer = fopen('php://memory', 'rw'); 
     25$streamLogger = new sfStreamLogger($dispatcher, array('stream' => $buffer)); 
    2526 
    2627// ->initialize() 
    …… 
    2930$t->is($logger->getLoggers(), array($fileLogger), '->initialize() can take a "loggers" parameter'); 
    3031 
    31 $logger = new sfAggregateLogger($dispatcher, array('loggers' => array($fileLogger, $consoleLogger))); 
    32 $t->is($logger->getLoggers(), array($fileLogger, $consoleLogger), '->initialize() can take a "loggers" parameter'); 
     32$logger = new sfAggregateLogger($dispatcher, array('loggers' => array($fileLogger, $streamLogger))); 
     33$t->is($logger->getLoggers(), array($fileLogger, $streamLogger), '->initialize() can take a "loggers" parameter'); 
    3334 
    3435// ->log() 
    3536$t->diag('->log()'); 
    36 ob_start(); 
    3737$logger->log('foo'); 
    38 $content = ob_get_clean(); 
     38rewind($buffer); 
     39$content = stream_get_contents($buffer); 
    3940$lines = explode("\n", file_get_contents($file)); 
    4041$t->like($lines[0], '/foo/', '->log() logs a message to all loggers'); 
    …… 
    4748 
    4849$logger = new sfAggregateLogger($dispatcher); 
    49 $logger->addLoggers(array($fileLogger, $consoleLogger)); 
    50 $t->is($logger->getLoggers(), array($fileLogger, $consoleLogger), '->addLoggers() adds an array of sfLogger instances'); 
     50$logger->addLoggers(array($fileLogger, $streamLogger)); 
     51$t->is($logger->getLoggers(), array($fileLogger, $streamLogger), '->addLoggers() adds an array of sfLogger instances'); 
    5152 
    5253// ->shutdown() 

  • branches/1.1/test/unit/log/sfConsoleLoggerTest.php

    r5249 r7452  
    1414 
    1515$logger = new sfConsoleLogger(new sfEventDispatcher()); 
    16 ob_start(); 
     16$logger->setStream($buffer = fopen('php://memory', 'rw')); 
     17 
    1718$logger->log('foo'); 
    18 $t->is(ob_get_clean(), "foo\n", 'sfConsoleLogger logs messages to the console'); 
     19rewind($buffer); 
     20$t->is(stream_get_contents($buffer), "foo\n", 'sfConsoleLogger logs messages to the console');