Skip to content

Commit 8bf9044

Browse files
committed
Merge 'richardkmiller/fix-date-format-for-resque-web' into old-pulls
Closes chrisboulton/php-resque#95
2 parents 170cba2 + f1ccf60 commit 8bf9044

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/Resque/Failure/Redis.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Resque_Failure_Redis implements Resque_Failure_Interface
2020
public function __construct($payload, $exception, $worker, $queue)
2121
{
2222
$data = new stdClass;
23-
$data->failed_at = strftime('%a %b %d %H:%M:%S %Z %Y');
23+
$data->failed_at = date('c');
2424
$data->payload = $payload;
2525
$data->exception = get_class($exception);
2626
$data->error = $exception->getMessage();

lib/Resque/Worker.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ public function workerPids()
484484
public function registerWorker()
485485
{
486486
Resque::redis()->sadd('workers', (string)$this);
487-
Resque::redis()->set('worker:' . (string)$this . ':started', strftime('%a %b %d %H:%M:%S %Z %Y'));
487+
Resque::redis()->set('worker:' . (string)$this . ':started', date('c'));
488488
}
489489

490490
/**
@@ -516,7 +516,7 @@ public function workingOn(Resque_Job $job)
516516
$job->updateStatus(Resque_Job_Status::STATUS_RUNNING);
517517
$data = json_encode(array(
518518
'queue' => $job->queue,
519-
'run_at' => strftime('%a %b %d %H:%M:%S %Z %Y'),
519+
'run_at' => date('c'),
520520
'payload' => $job->payload
521521
));
522522
Resque::redis()->set('worker:' . $job->worker, $data);

0 commit comments

Comments
 (0)