Merge pull request #22 from zhuravljov/master

Queue::push method without of channel param

Author: SilverFire

src/commands/CollectDependenciesCommand.php

@@ -39,7 +39,7 @@ public function run()
                 continue;
             }
 
-            Yii::$app->queue->push('package', Yii::createObject(PackageUpdateCommand::class, [$assetPackage]));
+            Yii::$app->queue->push(Yii::createObject(PackageUpdateCommand::class, [$assetPackage]));
             Yii::trace(Console::renderColoredString('Created update command for %Y' . $assetPackage->getFullName() . "%n package\n"), __CLASS__);
         }
 

src/commands/PackageUpdateCommand.php

@@ -29,7 +29,7 @@ public function run()
                 throw $e;
             }
 
-            Yii::$app->queue->push('package', Yii::createObject(CollectDependenciesCommand::class, [$this->package]));
+            Yii::$app->queue->push(Yii::createObject(CollectDependenciesCommand::class, [$this->package]));
         }
 
 

src/config/common.php

@@ -15,6 +15,7 @@
                 'class' => \zhuravljov\yii\queue\db\Driver::class,
                 'db' => 'db',
                 'tableName' => '{{%queue}}',
+                'channel' => 'package',
                 'mutex' => \yii\mutex\MysqlMutex::class,
             ],
         ],

src/console/MaintenanceController.php

@@ -71,7 +71,7 @@ public function actionUpdateExpired()
 
         foreach ($packages as $package) {
             $package->load();
-            Yii::$app->queue->push('package', Yii::createObject(PackageUpdateCommand::class, [$package]));
+            Yii::$app->queue->push(Yii::createObject(PackageUpdateCommand::class, [$package]));
 
             $message = "Package %N" . $package->getFullName() . '%n';
             $message .= " was updated " . Yii::$app->formatter->asRelativeTime($package->getUpdateTime());

src/console/QueueController.php

@@ -24,12 +24,11 @@ public function init()
     }
 
     /**
-     * Runs the queue in $channel
-     * @param string $channel Channel name
+     * Runs the queue
      */
-    public function actionRun($channel)
+    public function actionRun()
     {
-        Yii::$app->queue->driver->run($channel);
+        Yii::$app->queue->driver->run();
     }
 
     /**
@@ -52,17 +51,17 @@ private function attachEventHandlers()
 
         Event::on(Queue::class, Queue::EVENT_BEFORE_WORK, function ($event) use ($out) {
             /** @var JobEvent $event */
-            $out("%Y[{$event->channel}]%n %GNew job%n '" . get_class($event->job) . "'\n");
+            $out("%GNew job%n '" . get_class($event->job) . "'\n");
         });
 
         Event::on(Queue::class, Queue::EVENT_AFTER_WORK, function ($event) use ($out) {
             /** @var JobEvent $event */
-            $out("%Y[{$event->channel}]%n %GJob%n '" . get_class($event->job) . "' %Gis completed%n\n");
+            $out("%GJob%n '" . get_class($event->job) . "' %Gis completed%n\n");
         });
 
         Event::on(Queue::class, Queue::EVENT_AFTER_ERROR, function ($event) use ($out) {
             /** @var ErrorEvent $event */
-            $out("%Y[{$event->channel}]%n %RJob '" . get_class($event->job) . "' finished with error:%n '" . $event->error . "'\n");
+            $out("%RJob '" . get_class($event->job) . "' finished with error:%n '" . $event->error . "'\n");
         });
 
         Event::on(AbstractPackageCommand::class, AbstractPackageCommand::EVENT_BEFORE_RUN, function ($event) use ($out) {