diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php index 71c0472..a695b09 100644 --- a/src/ConfigProvider.php +++ b/src/ConfigProvider.php @@ -2,11 +2,6 @@ namespace Depa\MiddlewareLogger; - - - - - /** * The configuration provider for the Core module * diff --git a/src/LoggerFactory.php b/src/LoggerFactory.php index 40d4cd7..8038f50 100644 --- a/src/LoggerFactory.php +++ b/src/LoggerFactory.php @@ -4,9 +4,6 @@ use Interop\Container\ContainerInterface; use Zend\ServiceManager\Factory\FactoryInterface; - - - class LoggerFactory implements FactoryInterface{ /** * {@inheritDoc} @@ -15,23 +12,18 @@ class LoggerFactory implements FactoryInterface{ public function __invoke(ContainerInterface $container,$requestedName, array $options = null) { $config = $container->get('config'); + $loggerConfig = array_key_exists('logger', $config) ? $config['logger'] : []; - if (!isset($config['logger'])) { -// $sessionManager = new SessionManager(); -// Container::setDefaultManager($sessionManager); -// return $sessionManager; - } - + $logWriter = array_key_exists('writer', $loggerConfig) ? $loggerConfig['writer'] : 'Null'; - //$PsrLogger = (new \Depa\MiddlewareLogger\Logger\NullLogger())->getLogger(); - $PsrLogger = (new \Depa\MiddlewareLogger\Logger\ChromePhpLogger())->getLogger(); + $logWriter = '\\Depa\\MiddlewareLogger\\Logger\\'.$logWriter.'Logger'; + + $PsrLogger = (new $logWriter())->getLogger(); + $log = new Logger($PsrLogger); return ($log); } - - - } \ No newline at end of file diff --git a/src/LoggerMiddleware.php b/src/LoggerMiddleware.php index 5af14fe..2b4fe90 100644 --- a/src/LoggerMiddleware.php +++ b/src/LoggerMiddleware.php @@ -5,11 +5,6 @@ use Interop\Http\ServerMiddleware\MiddlewareInterface; use Psr\Http\Message\ServerRequestInterface; - - - - - class LoggerMiddleware implements MiddlewareInterface { private $zendLogger; @@ -24,17 +19,7 @@ public function __construct( $logger) */ public function process(ServerRequestInterface $request, DelegateInterface $delegate) { - $this->zendLogger::alert("huuuuw"); - $this->zendLogger::alert("bla"); - //$this->zendLogger->alert(microtime()); - //was loggen??? $response = $delegate->process($request); - - //$this->zendLogger->notice(array(1,2,3)); - - //was loggen? return $response; - - } } \ No newline at end of file diff --git a/src/LoggerMiddlewareFactory.php b/src/LoggerMiddlewareFactory.php index c624c26..504b99c 100644 --- a/src/LoggerMiddlewareFactory.php +++ b/src/LoggerMiddlewareFactory.php @@ -3,19 +3,12 @@ use Interop\Container\ContainerInterface; - class LoggerMiddlewareFactory { + public function __invoke(ContainerInterface $container) { -$logger = $container->get(Logger::class); - - -/* $logger = new \Zend\Log\Logger(); -$logger->addWriter(new \Zend\Log\Writer\ChromePHP()); -$PsrLogger = new \Zend\Log\PsrLoggerAdapter($logger); */ - - - return new LoggerMiddleware($logger ); + $logger = $container->get(Logger::class); + return new LoggerMiddleware($logger); } }