Merge pull request #5 from claroline/update_logger

Update logger
claroline · Mar 4, 2015 · 3fc8dc1 · 3fc8dc1
2 parents 6957f44 + dbec4fa
commit 3fc8dc1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/Command/AbstractCommand.php b/Command/AbstractCommand.php
@@ -11,9 +11,11 @@
 
 namespace Claroline\MigrationBundle\Command;
 
+use Psr\Log\LogLevel;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Logger\ConsoleLogger;
 use Symfony\Component\Console\Output\OutputInterface;
 
 abstract class AbstractCommand extends ContainerAwareCommand
@@ -44,11 +46,13 @@ function ($argument) {
     protected function getManager(OutputInterface $output)
     {
         $manager = $this->getContainer()->get('claroline.migration.manager');
-        $manager->setLogger(
-            function ($message) use ($output) {
-                $output->writeln($message);
-            }
+        $verbosityLevelMap = array(
+            LogLevel::NOTICE => OutputInterface::VERBOSITY_NORMAL,
+            LogLevel::INFO   => OutputInterface::VERBOSITY_NORMAL,
+            LogLevel::DEBUG  => OutputInterface::VERBOSITY_NORMAL
         );
+        $consoleLogger = new ConsoleLogger($output, $verbosityLevelMap);
+        $manager->setLogger($consoleLogger);
 
         return $manager;
     }

diff --git a/Manager/Manager.php b/Manager/Manager.php
@@ -11,6 +11,7 @@
 
 namespace Claroline\MigrationBundle\Manager;
 
+use Claroline\InstallationBundle\Log\LoggableTrait;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Claroline\MigrationBundle\Generator\Generator;
 use Claroline\MigrationBundle\Generator\Writer;
@@ -21,10 +22,11 @@
  */
 class Manager
 {
+    use LoggableTrait;
+
     private $generator;
     private $writer;
     private $migrator;
-    private $logger;
 
     /**
      * Constructor.
@@ -44,16 +46,6 @@ public function __construct(
         $this->writer = $writer;
     }
 
-    /**
-     * Sets a logger for this class's operations.
-     *
-     * @param \Closure $logger
-     */
-    public function setLogger(\Closure $logger)
-    {
-        $this->logger = $logger;
-    }
-
     /**
      * Generates bundle migrations classes for all the available driver platforms.
      *
@@ -179,11 +171,4 @@ private function doMigrate(Bundle $bundle, $version, $direction)
                 "Done: bundle is now at version {$currentVersion}"
         );
     }
-
-    private function log($message)
-    {
-        if ($log = $this->logger) {
-            $log($message);
-        }
-    }
 }