Merge pull request laravel#4406 from alprs/feature/error-log-handler

taylorotwell · taylorotwell · commit 483422ba3030 · 2014-05-13T18:26:33.000-04:00
[4.2] Enable easier usage of error_log in Log\Writer
diff --git a/src/Illuminate/Log/Writer.php b/src/Illuminate/Log/Writer.php
@@ -5,6 +5,7 @@
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger as MonologLogger;
 use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\ErrorLogHandler;
 use Monolog\Handler\RotatingFileHandler;
 use Illuminate\Support\Contracts\JsonableInterface;
 use Illuminate\Support\Contracts\ArrayableInterface;
@@ -88,7 +89,7 @@ public function useFiles($path, $level = 'debug')
 
 		$this->monolog->pushHandler($handler = new StreamHandler($path, $level));
 
-		$handler->setFormatter(new LineFormatter(null, null, true));
+		$handler->setFormatter($this->getDefaultFormatter());
 	}
 
 	/**
@@ -105,7 +106,33 @@ public function useDailyFiles($path, $days = 0, $level = 'debug')
 
 		$this->monolog->pushHandler($handler = new RotatingFileHandler($path, $days, $level));
 
-		$handler->setFormatter(new LineFormatter(null, null, true));
+		$handler->setFormatter($this->getDefaultFormatter());
+	}
+
+	/**
+	 * Register an error_log handler.
+	 *
+	 * @param  integer $messageType
+	 * @param  string  $level
+	 * @return void
+	 */
+	public function useErrorLog($level = 'debug', $messageType = ErrorLogHandler::OPERATING_SYSTEM)
+	{
+		$level = $this->parseLevel($level);
+
+		$this->monolog->pushHandler($handler = new ErrorLogHandler($messageType, $level));
+
+		$handler->setFormatter($this->getDefaultFormatter());
+	}
+
+	/**
+	 * Get a defaut Monolog formatter instance.
+	 *
+	 * @return \Monolog\Formatters\LineFormatter
+	 */
+	protected function getDefaultFormatter()
+	{
+		return new LineFormatter(null, null, true);
 	}
 
 	/**
diff --git a/tests/Log/LogWriterTest.php b/tests/Log/LogWriterTest.php
@@ -27,6 +27,14 @@ public function testRotatingFileHandlerCanBeAdded()
 	}
 
 
+	public function testErrorLogHandlerCanBeAdded()
+	{
+		$writer = new Writer($monolog = m::mock('Monolog\Logger'));
+		$monolog->shouldReceive('pushHandler')->once()->with(m::type('Monolog\Handler\ErrorLogHandler'));
+		$writer->useErrorLog();
+	}
+
+
 	public function testMagicMethodsPassErrorAdditionsToMonolog()
 	{
 		$writer = new Writer($monolog = m::mock('Monolog\Logger'));

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,14 @@ public function testRotatingFileHandlerCanBeAdded()`
`27`	`27`	`}`
`28`	`28`
`29`	`29`
	`30`	`+ public function testErrorLogHandlerCanBeAdded()`
	`31`	`+ {`
	`32`	`+ $writer = new Writer($monolog = m::mock('Monolog\Logger'));`
	`33`	`+ $monolog->shouldReceive('pushHandler')->once()->with(m::type('Monolog\Handler\ErrorLogHandler'));`
	`34`	`+ $writer->useErrorLog();`
	`35`	`+ }`
	`36`	`+`
	`37`	`+`
`30`	`38`	`public function testMagicMethodsPassErrorAdditionsToMonolog()`
`31`	`39`	`{`
`32`	`40`	`$writer = new Writer($monolog = m::mock('Monolog\Logger'));`