Merge pull request #32 from tamagokun/logger_interface

Logger interface Closes #31

Author: tamagokun

lib/Rackem/Logger.php

@@ -3,59 +3,84 @@
 
 class Logger
 {
-	const FATAL = 5;
-	const ERROR = 4;
-	const WARN = 3;
-	const INFO  = 2;
-	const DEBUG = 1;
-
-	public $level=2, $stream, $formatter, $datetime_format;
-
-	public function __construct($stream)
-	{
-		$this->stream = is_string($stream)? fopen($stream, 'a') : $stream;
-		$this->datetime_format = "D M d H:i:s Y";
-		$this->formatter = function($severity, $datetime, $progname, $msg) {
-			return "[$datetime] $severity -- $progname: $msg\n";
-		};
-	}
-
-	public function close()
-	{
-		if(is_resource($this->stream)) fclose($this->stream);
-	}
-
-	public function info($msg) { return $this->log(Logger::INFO,func_get_args()); }
-	public function debug($msg) { return $this->log(Logger::DEBUG,func_get_args()); }
-	public function warn($msg) { return $this->log(Logger::WARN,func_get_args()); }
-	public function error($msg) { return $this->log(Logger::ERROR,func_get_args()); }
-	public function fatal($msg) { return $this->log(Logger::FATAL,func_get_args()); }
-
-	//protected
-	protected function log($level,$args)
-	{
-		$prog = "";
-		$message = "";
-		$block = null;
-		foreach($args as $arg)
-		{
-			if(is_string($arg)) $message = $arg;
-			if(is_callable($arg)) $block = $arg;
-		}
-		if($level < $this->level) return false;
-		$formatter = $this->formatter;
-		if(!is_null($block))
-		{
-			$prog = $message;
-			$message = $block();
-		}
-		return fwrite($this->stream, $formatter($this->severity_label($level),@date($this->datetime_format),$prog,$message));
-	}
-
-	protected function severity_label($level)
-	{
-		$ref = new \ReflectionClass($this);
-		foreach($ref->getConstants() as $key=>$value) if($value == $level) return $key;
-		return "";
-	}
+    const EMERGENCY = 'emergency';
+    const ALERT     = 'alert';
+    const CRITICAL  = 'critical';
+    const ERROR     = 'error';
+    const WARNING   = 'warning';
+    const NOTICE    = 'notice';
+    const INFO      = 'info';
+    const DEBUG     = 'debug';
+
+    public $stream, $formatter, $datetime_format;
+
+    public function __construct($stream)
+    {
+        $this->stream = is_string($stream)? fopen($stream, 'a') : $stream;
+        $this->datetime_format = "D M d H:i:s Y";
+        $this->formatter = function($severity, $datetime, $msg) {
+            return "[$datetime] $severity -- $msg\n";
+        };
+    }
+
+    public function close()
+    {
+        if(is_resource($this->stream)) fclose($this->stream);
+    }
+
+    public function emergency($message, array $context = array())
+    {
+        $this->log(static::EMERGENCY, $message, $context);
+    }
+
+    public function alert($message, array $context = array())
+    {
+        $this->log(static::ALERT, $message, $context);
+    }
+
+    public function critical($message, array $context = array())
+    {
+        $this->log(static::CRITICAL, $message, $context);
+    }
+
+    public function error($message, array $context = array())
+    {
+        $this->log(static::ERROR, $message, $context);
+    }
+
+    public function warning($message, array $context = array())
+    {
+        $this->log(static::WARNING, $message, $context);
+    }
+
+    public function notice($message, array $context = array())
+    {
+        $this->log(static::NOTICE, $message, $context);
+    }
+
+    public function info($message, array $context = array())
+    {
+        $this->log(static::INFO, $message, $context);
+    }
+
+    public function debug($message, array $context = array())
+    {
+        $this->log(static::DEBUG, $message, $context);
+    }
+
+    public function log($level, $message, array $context = array())
+    {
+        if(!defined(__CLASS__.'::'.strtoupper($level))) {
+            throw new \InvalidArgumentException("Log level $level is not defined.");
+        }
+
+        if(is_callable($message)) $message = $message($context);
+        $this->write($level, $message, $this->formatter);
+    }
+
+    //protected
+    protected function write($level, $message, $format)
+    {
+        fwrite( $this->stream, $format(strtoupper($level), @date($this->datetime_format), $message) );
+    }
 }

lib/Rackem/RackLogger.php

@@ -1,22 +1,11 @@
 <?php
 namespace Rackem;
 
-class RackLogger
+class RackLogger extends Middleware
 {
-	protected $app,$level;
-
-	public function __construct($app, $level = \Rackem\Logger::INFO)
-	{
-		$this->app = $app;
-		$this->level = empty($level)? \Rackem\Logger::INFO : $level;
-	}
-
-	public function call($env)
-	{
-		$logger = new \Rackem\Logger($env['rack.errors']);
-		$logger->level = $this->level;
-
-		$env['rack.logger'] = $logger;
-		return $this->app->call($env);
-	}
-}
+    public function call($env)
+    {
+        $env['rack.logger'] = new \Rackem\Logger($env['rack.errors']);
+        return $this->app->call($env);
+    }
+}

lib/Rackem/Server/Connection.php

@@ -128,7 +128,7 @@ public function read()
         list($request, $headers) = $this->parse_header(substr($this->buffer, 0, $end));
         list($version, $status, $phrase) = explode(' ', $request, 3);
         $this->status = $status;
-        $this->response_length = (int)$headers['Content-Length'][0];
+        $this->response_length = isset($headers['Content-Length'])? (int)$headers['Content-Length'][0] : 0;
     }
 
     /*