Merge 'richardkmiller/fix-date-format-for-resque-web' into old-pulls

Closes chrisboulton/php-resque#95
resque · Dec 11, 2018 · 429d07c · 429d07c
2 parents 415eb00 + f1ccf60
commit 429d07c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Resque/Failure/Redis.php b/lib/Resque/Failure/Redis.php
@@ -20,7 +20,7 @@ class Resque_Failure_Redis implements Resque_Failure_Interface
 	public function __construct($payload, $exception, $worker, $queue)
 	{
 		$data = new stdClass;
-		$data->failed_at = strftime('%a %b %d %H:%M:%S %Z %Y');
+		$data->failed_at = date('c');
 		$data->payload = $payload;
 		$data->exception = get_class($exception);
 		$data->error = $exception->getMessage();

diff --git a/lib/Resque/Worker.php b/lib/Resque/Worker.php
@@ -484,7 +484,7 @@ public function workerPids()
 	public function registerWorker()
 	{
 		Resque::redis()->sadd('workers', (string)$this);
-		Resque::redis()->set('worker:' . (string)$this . ':started', strftime('%a %b %d %H:%M:%S %Z %Y'));
+		Resque::redis()->set('worker:' . (string)$this . ':started', date('c'));
 	}
 
 	/**
@@ -516,7 +516,7 @@ public function workingOn(Resque_Job $job)
 		$job->updateStatus(Resque_Job_Status::STATUS_RUNNING);
 		$data = json_encode(array(
 			'queue' => $job->queue,
-			'run_at' => strftime('%a %b %d %H:%M:%S %Z %Y'),
+			'run_at' => date('c'),
 			'payload' => $job->payload
 		));
 		Resque::redis()->set('worker:' . $job->worker, $data);