Merge pull request #135 from dereuromark/bugfix/duplicates

Fix duplicates on job processing

Author: dereuromark

src/Controller/Admin/QueueController.php

@@ -80,7 +80,24 @@ public function resetJob($id = null) {
 
 		$this->QueuedJobs->reset($id);
 
-		$this->Flash->success('Job # ' . $id . ' added');
+		$this->Flash->success('Job # ' . $id . ' re-added');
+
+		return $this->redirect(['action' => 'index']);
+	}
+
+	/**
+	 * @param string|null $id
+	 *
+	 * @return \Cake\Http\Response
+	 */
+	public function removeJob($id = null) {
+		if (!$id) {
+			throw new NotFoundException();
+		}
+
+		$this->QueuedJobs->delete($id);
+
+		$this->Flash->success('Job # ' . $id . ' deleted');
 
 		return $this->redirect(['action' => 'index']);
 	}

src/Model/Table/QueuedJobsTable.php

@@ -240,6 +240,7 @@ public function requestJob(array $capabilities, $group = null) {
 		$job = $this->getConnection()->transactional(function () use ($query, $options, $now) {
 			$job = $query->find('all', $options)
 				->enableAutoFields(true)
+				->epilog('FOR UPDATE')
 				->first();
 
 			if (!$job) {

src/Shell/QueueShell.php

@@ -185,6 +185,7 @@ public function runworker() {
 					$this->out('Job Finished.');
 				} else {
 					$this->QueuedJobs->markJobFailed($queuedTask, $failureMessage);
+					$this->_log('job ' . $queuedTask['job_type'] . ', id ' . $queuedTask['id'] . ' failed and requeued', $pid);
 					$this->out('Job did not finish, requeued.');
 				}
 			} elseif (Configure::read('Queue.exitwhennothingtodo')) {

src/Template/Admin/Queue/index.ctp

@@ -35,14 +35,15 @@ foreach ($pendingDetails as $item) {
 	$reset = '';
 	if ($item['failed']) {
 		$reset = ' ' . $this->Form->postLink('Soft reset', ['action' => 'resetJob', $item['id']], ['confirm' => 'Sure?']);
+		$reset .= ' ' . $this->Form->postLink('Remove', ['action' => 'removeJob', $item['id']], ['confirm' => 'Sure?']);
 	}
 
-	echo '<li>Created: ' . $item['created'] . '</li>';
-	echo '<li>Fetched: ' . $item['fetched'] . '</li>';
+	echo '<li>Created: ' . $this->Time->nice($item['created']) . '</li>';
+	echo '<li>Fetched: ' . $this->Time->nice($item['fetched']) . '</li>';
 	echo '<li>Status: ' . $item['status'] . '</li>';
 	echo '<li>Progress: ' . $this->Number->toPercentage($item['progress'] * 100, 0) . '</li>';
 	echo '<li>Failures: ' . $item['failed'] . $reset . '</li>';
-	echo '<li>Failure Message: ' . $item['failure_message'] . '</li>';
+	echo '<li>Failure Message: ' . h($item['failure_message']) . '</li>';
 	echo '</ul>';
 	echo '</li>';
 }

src/Template/Admin/Queue/processes.ctp

@@ -15,7 +15,7 @@ use Cake\I18n\Time;
 foreach ($processes as $process => $timestamp) {
 	echo '<li>' . $process . ':';
 	echo '<ul>';
-		echo '<li>Last run: ' . (new Time($timestamp)) . '</li>';
+		echo '<li>Last run: ' . $this->Time->nice(new Time($timestamp)) . '</li>';
 		echo '<li>Kill: ' . $this->Form->postLink('Soft kill', ['action' => 'processes', '?' => ['kill' => $process]], ['confirm' => 'Sure?']) . ' (next loop run)</li>';
 	echo '</ul>';
 	echo '</li>';