Skip to content
Browse files

Merge remote branch 'stof/monolog'

* stof/monolog:
  Updated MonologBundle config for the new syntax for nested handlers
  Replaced Zend\Log with Monolog
  • Loading branch information...
2 parents a0d59bc + 20059f3 commit 3644957eee36935e347fac9afa2f6c2a995d65ff @fabpot fabpot committed
Showing with 25 additions and 10 deletions.
  1. +1 −1 app/AppKernel.php
  2. +1 −1 app/autoload.php
  3. +6 −4 app/config/config_dev.yml
  4. +11 −0 app/config/config_prod.yml
  5. +4 −0 bin/build.sh
  6. +2 −4 bin/vendors.sh
View
2 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(),
View
2 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',
));
View
10 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
View
11 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
View
4 bin/build.sh
@@ -82,6 +82,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 -
View
6 bin/vendors.sh
@@ -69,10 +69,8 @@ install_git twig git://github.com/fabpot/Twig.git v1.0.0
# 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 ../..
# SensioFrameworkExtraBundle

0 comments on commit 3644957

Please sign in to comment.
Something went wrong with that request. Please try again.