diff --git a/app/AppKernel.php b/app/AppKernel.php index 4aed8a0334..6285de337d 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -11,7 +11,7 @@ public function registerBundles() new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), new Symfony\Bundle\SecurityBundle\SecurityBundle(), new Symfony\Bundle\TwigBundle\TwigBundle(), - new Symfony\Bundle\ZendBundle\ZendBundle(), + new Symfony\Bundle\MonologBundle\MonologBundle(), new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), new Symfony\Bundle\DoctrineBundle\DoctrineBundle(), new Symfony\Bundle\AsseticBundle\AsseticBundle(), diff --git a/app/autoload.php b/app/autoload.php index 37044954ad..d16cd7ec3b 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -10,7 +10,7 @@ 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', - 'Zend\\Log' => __DIR__.'/../vendor/zend-log', + 'Monolog' => __DIR__.'/../vendor/monolog/src', 'Assetic' => __DIR__.'/../vendor/assetic/src', 'Acme' => __DIR__.'/../src', )); diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index ed41e77e36..7599e922f4 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -9,10 +9,12 @@ web_profiler: toolbar: true intercept_redirects: false -zend: - logger: - priority: debug - path: %kernel.logs_dir%/%kernel.environment%.log +monolog: + handlers: + main: + type: stream + path: %kernel.logs_dir%/%kernel.environment%.log + level: debug assetic: use_controller: true diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 8e0b6ff02b..37de15cd48 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -1,2 +1,13 @@ imports: - { resource: config.yml } + +monolog: + handlers: + main: + type: fingerscrossed + action_level: error + handler: nested + nested: + type: stream + path: %kernel.logs_dir%/%kernel.environment%.log + level: debug diff --git a/bin/build.sh b/bin/build.sh index e99e6f03b4..769c3ccd19 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -78,6 +78,10 @@ cd $TARGET cd twig-extensions && rm -rf README doc phpunit.xml* test cd $TARGET +# Monolog +cd monolog && rm -rf README.markdown phpunit.xml* tests +cd $TARGET + # cleanup find . -name .git | xargs rm -rf - find . -name .gitignore | xargs rm -rf - diff --git a/bin/vendors.sh b/bin/vendors.sh index a741b65bd9..effe99a201 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -69,10 +69,8 @@ install_git twig git://github.com/fabpot/Twig.git # Twig Extensions install_git twig-extensions git://github.com/fabpot/Twig-extensions.git -# Zend Framework Log -mkdir -p zend-log/Zend -cd zend-log/Zend -install_git Log git://github.com/symfony/zend-log.git +# Monolog +install_git monolog git://github.com/Seldaek/monolog.git cd ../.. # FrameworkExtraBundle