Merge pull request #5 from Vincent-Simonin/development

Development
mmoreram · Mar 20, 2012 · c23acd1 · c23acd1 · Vincent-Simonin · Mar 21, 2012
2 parents e751308 + eb575c7
commit c23acd1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/Command/GearmanJobExecuteCommand.php b/Command/GearmanJobExecuteCommand.php
@@ -24,7 +24,8 @@ protected function configure()
         parent::configure();
         $this->setName('gearman:job:execute')
              ->setDescription('Execute one single job')
-             ->addArgument('job', InputArgument::REQUIRED, 'job to execute');
+             ->addArgument('job', InputArgument::REQUIRED, 'job to execute')
+             ->addOption('no-description', null, InputOption::VALUE_NONE, 'Don\'t print job description');
     }
 
     /**
@@ -43,12 +44,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!$input->getOption('no-interaction') && !$dialog->askConfirmation($output, '<question>This will execute asked job?</question>', 'y')) {
             return;
         }
-        $output->writeln('<info>loading...</info>');
+        $output->writeln(sprintf('<info>[%s] loading...</info>', date('Y-m-d H:i:s')));
 
         $job = $input->getArgument('job');
         $jobStruct = $this->getContainer()->get('gearman')->getJob($job);
-        $this->getContainer()->get('gearman.describer')->describeJob($output, $jobStruct, true);
-        $output->writeln('<info>loaded. Ctrl+C to break</info>');
+
+        if (!$input->getOption('no-description')) {
+            $this->getContainer()->get('gearman.describer')->describeJob($output, $jobStruct, true);
+        }
+
+        $output->writeln(sprintf('<info>[%s] loaded. Ctrl+C to break</info>', date('Y-m-d H:i:s')));
         $this->getContainer()->get('gearman.execute')->executeJob($job);
     }
 }
diff --git a/Command/GearmanWorkerExecuteCommand.php b/Command/GearmanWorkerExecuteCommand.php
@@ -24,7 +24,8 @@ protected function configure()
         parent::configure();
         $this->setName('gearman:worker:execute')
              ->setDescription('Execute one worker with all contained Jobs')
-             ->addArgument('worker', InputArgument::REQUIRED, 'work to execute');
+             ->addArgument('worker', InputArgument::REQUIRED, 'work to execute')
+             ->addOption('no-description', null, InputOption::VALUE_NONE, 'Don\'t print worker description');
     }
 
     /**
@@ -43,12 +44,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!$input->getOption('no-interaction') && !$dialog->askConfirmation($output, '<question>This will execute asked worker with all its jobs?</question>', 'y')) {
             return;
         }
-        $output->writeln('<info>loading...</info>');
+        $output->writeln(sprintf('<info>[%s] loading...</info>', date('Y-m-d H:i:s')));
 
         $worker = $input->getArgument('worker');
         $workerStruct = $this->getContainer()->get('gearman')->getWorker($worker);
-        $this->getContainer()->get('gearman.describer')->describeWorker($output, $workerStruct, true);
-        $output->writeln('<info>loaded. Ctrl+C to break</info>');
+
+        if (!$input->getOption('no-description')) {
+            $this->getContainer()->get('gearman.describer')->describeWorker($output, $workerStruct, true);
+        }
+
+        $output->writeln(sprintf('<info>[%s] loaded. Ctrl+C to break</info>', date('Y-m-d H:i:s')));
         $this->getContainer()->get('gearman.execute')->executeWorker($worker);
     }
 }