统一配置格式、时间字段规则

Author: yunwuxin

src/Queue.php

@@ -37,12 +37,12 @@ class Queue extends Factory
      */
     protected function getConfig($name)
     {
-        return $this->app->config->get("queue.connections.{$name}", ['driver' => 'sync']);
+        return $this->app->config->get("queue.connections.{$name}", ['type' => 'sync']);
     }
 
     protected function createDriver($name)
     {
-        $driver = $this->getConfig($name)['driver'];
+        $driver = $this->getConfig($name)['type'];
 
         $class = false !== strpos($driver, '\\') ? $driver : $this->namespace . Str::studly($driver);
 

src/config.php

@@ -13,15 +13,15 @@
     'default'     => 'sync',
     'connections' => [
         'sync'     => [
-            'driver' => 'sync',
+            'type' => 'sync',
         ],
         'database' => [
-            'driver' => 'database',
-            'queue'  => 'default',
-            'table'  => 'jobs',
+            'type'  => 'database',
+            'queue' => 'default',
+            'table' => 'jobs',
         ],
         'redis'    => [
-            'driver'     => 'redis',
+            'type'       => 'redis',
             'queue'      => 'default',
             'host'       => '127.0.0.1',
             'port'       => 6379,

src/queue/command/ListFailed.php

@@ -13,7 +13,7 @@ class ListFailed extends Command
      *
      * @var array
      */
-    protected $headers = ['ID', 'Connection', 'Queue', 'Class', 'Failed At'];
+    protected $headers = ['ID', 'Connection', 'Queue', 'Class', 'Fail Time'];
 
     protected function configure()
     {

src/queue/command/stubs/failed_jobs.stub

@@ -12,7 +12,7 @@ class CreateFailedJobsTable extends Migrator
             ->addColumn(Column::text('queue'))
             ->addColumn(Column::longText('payload'))
             ->addColumn(Column::longText('exception'))
-            ->addColumn(Column::timestamp('failed_at')->setDefault('CURRENT_TIMESTAMP'))
+            ->addColumn(Column::timestamp('fail_time')->setDefault('CURRENT_TIMESTAMP'))
             ->create();
     }
 }

src/queue/command/stubs/jobs.stub

@@ -11,9 +11,9 @@ class CreateJobsTable extends Migrator
             ->addColumn(Column::string('queue'))
             ->addColumn(Column::longText('payload'))
             ->addColumn(Column::tinyInteger('attempts')->setUnsigned())
-            ->addColumn(Column::unsignedInteger('reserved_at')->setNullable())
-            ->addColumn(Column::unsignedInteger('available_at'))
-            ->addColumn(Column::unsignedInteger('created_at'))
+            ->addColumn(Column::unsignedInteger('reserve_time')->setNullable())
+            ->addColumn(Column::unsignedInteger('available_time'))
+            ->addColumn(Column::unsignedInteger('create_time'))
             ->addIndex('queue')
             ->create();
     }

src/queue/connector/Database.php

@@ -91,12 +91,12 @@ public function bulk($jobs, $data = '', $queue = null)
         return $this->db->name($this->table)->insertAll(collect((array) $jobs)->map(
             function ($job) use ($queue, $data, $availableAt) {
                 return [
-                    'queue'        => $queue,
-                    'attempts'     => 0,
-                    'reserved_at'  => null,
-                    'available_at' => $availableAt,
-                    'created_at'   => $this->currentTime(),
-                    'payload'      => $this->createPayload($job, $data),
+                    'queue'          => $queue,
+                    'attempts'       => 0,
+                    'reserve_time'   => null,
+                    'available_time' => $availableAt,
+                    'create_time'    => $this->currentTime(),
+                    'payload'        => $this->createPayload($job, $data),
                 ];
             }
         )->all());
@@ -127,12 +127,12 @@ public function release($queue, $job, $delay)
     protected function pushToDatabase($queue, $payload, $delay = 0, $attempts = 0)
     {
         return $this->db->name($this->table)->insertGetId([
-            'queue'        => $this->getQueue($queue),
-            'attempts'     => $attempts,
-            'reserved_at'  => null,
-            'available_at' => $this->availableAt($delay),
-            'created_at'   => $this->currentTime(),
-            'payload'      => $payload,
+            'queue'          => $this->getQueue($queue),
+            'attempts'       => $attempts,
+            'reserve_time'   => null,
+            'available_time' => $this->availableAt($delay),
+            'create_time'    => $this->currentTime(),
+            'payload'        => $payload,
         ]);
     }
 
@@ -165,15 +165,15 @@ protected function getNextAvailableJob($queue)
             ->where('queue', $this->getQueue($queue))
             ->where(function (Query $query) {
                 $query->where(function (Query $query) {
-                    $query->whereNull('reserved_at')
-                        ->where('available_at', '<=', $this->currentTime());
+                    $query->whereNull('reserve_time')
+                        ->where('available_time', '<=', $this->currentTime());
                 });
 
                 //超时任务重试
                 $expiration = Carbon::now()->subSeconds($this->retryAfter)->getTimestamp();
 
                 $query->whereOr(function (Query $query) use ($expiration) {
-                    $query->where('reserved_at', '<=', $expiration);
+                    $query->where('reserve_time', '<=', $expiration);
                 });
             })
             ->order('id', 'asc')
@@ -191,8 +191,8 @@ protected function getNextAvailableJob($queue)
     protected function markJobAsReserved($job)
     {
         $this->db->name($this->table)->where('id', $job->id)->update([
-            'reserved_at' => $job->reserved_at = $this->currentTime(),
-            'attempts'    => ++$job->attempts,
+            'reserve_time' => $job->reserve_time = $this->currentTime(),
+            'attempts'     => ++$job->attempts,
         ]);
 
         return $job;

src/queue/failed/Database.php

@@ -46,7 +46,7 @@ public function log($connection, $queue, $payload, $exception)
         $exception = (string) $exception;
 
         return $this->getTable()->insertGetId(compact(
-            'connection', 'queue', 'payload', 'exception', 'failed_at'
+            'connection', 'queue', 'payload', 'exception', 'fail_time'
         ));
     }