Skip to content

Commit 917e3bd

Browse files
authored
Allow adding only CLI vs WEB. (#345)
* Allow adding only CLI vs WEB. * Fix test.
1 parent ee7ff4d commit 917e3bd

13 files changed

+38
-13
lines changed

src/Controller/Admin/QueueController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Controller\AppController;
66
use Cake\Core\App;
77
use Cake\Http\Exception\NotFoundException;
8+
use Queue\Queue\AddFromBackendInterface;
89
use Queue\Queue\TaskFinder;
910

1011
/**
@@ -53,7 +54,7 @@ public function index() {
5354

5455
$taskFinder = new TaskFinder();
5556
$tasks = $taskFinder->all();
56-
$addableTasks = $taskFinder->allAddable();
57+
$addableTasks = $taskFinder->allAddable(AddFromBackendInterface::class);
5758

5859
$servers = $this->QueueProcesses->find()->distinct(['server'])->find('list', ['keyField' => 'server', 'valueField' => 'server'])->toArray();
5960
$this->set(compact('new', 'current', 'data', 'pendingDetails', 'status', 'tasks', 'addableTasks', 'servers'));
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
namespace Queue\Queue;
4+
5+
/**
6+
* Any task that does not need arguments and can be added from backend GUI.
7+
*
8+
* @author Mark Scherer
9+
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
10+
*/
11+
interface AddFromBackendInterface {
12+
}

src/Queue/Task/CostsExampleTask.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
namespace Queue\Queue\Task;
44

5+
use Queue\Queue\AddFromBackendInterface;
56
use Queue\Queue\AddInterface;
67
use Queue\Queue\Task;
78

89
/**
910
* A Costs QueueTask example.
1011
*/
11-
class CostsExampleTask extends Task implements AddInterface {
12+
class CostsExampleTask extends Task implements AddInterface, AddFromBackendInterface {
1213

1314
/**
1415
* @var int

src/Queue/Task/EmailTask.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Psr\Log\LoggerInterface;
1111
use Queue\Console\Io;
1212
use Queue\Model\QueueException;
13+
use Queue\Queue\AddFromBackendInterface;
1314
use Queue\Queue\AddInterface;
1415
use Queue\Queue\Task;
1516
use Throwable;
@@ -23,7 +24,7 @@
2324
* @author Mark Scherer
2425
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
2526
*/
26-
class EmailTask extends Task implements AddInterface {
27+
class EmailTask extends Task implements AddInterface, AddFromBackendInterface {
2728

2829
/**
2930
* @var int

src/Queue/Task/ExampleTask.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66

77
namespace Queue\Queue\Task;
88

9+
use Queue\Queue\AddFromBackendInterface;
910
use Queue\Queue\AddInterface;
1011
use Queue\Queue\Task;
1112

1213
/**
1314
* A Simple QueueTask example.
1415
*/
15-
class ExampleTask extends Task implements AddInterface {
16+
class ExampleTask extends Task implements AddInterface, AddFromBackendInterface {
1617

1718
/**
1819
* Timeout for run, after which the Task is reassigned to a new worker.

src/Queue/Task/ExceptionExampleTask.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
namespace Queue\Queue\Task;
44

55
use Queue\Model\QueueException;
6+
use Queue\Queue\AddFromBackendInterface;
67
use Queue\Queue\AddInterface;
78
use Queue\Queue\Task;
89

910
/**
1011
* An exception throwing QueueTask example.
1112
*/
12-
class ExceptionExampleTask extends Task implements AddInterface {
13+
class ExceptionExampleTask extends Task implements AddInterface, AddFromBackendInterface {
1314

1415
/**
1516
* Timeout for run, after which the Task is reassigned to a new worker.

src/Queue/Task/MonitorExampleTask.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
namespace Queue\Queue\Task;
77

88
use Cake\Log\LogTrait;
9+
use Queue\Queue\AddFromBackendInterface;
910
use Queue\Queue\AddInterface;
1011
use Queue\Queue\Task;
1112

1213
/**
1314
* A Simple QueueTask example.
1415
*/
15-
class MonitorExampleTask extends Task implements AddInterface {
16+
class MonitorExampleTask extends Task implements AddInterface, AddFromBackendInterface {
1617

1718
use LogTrait;
1819

src/Queue/Task/ProgressExampleTask.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
namespace Queue\Queue\Task;
44

5+
use Queue\Queue\AddFromBackendInterface;
56
use Queue\Queue\AddInterface;
67
use Queue\Queue\Task;
78

89
/**
910
* A Simple QueueTask example that runs for a while and updates the progress field.
1011
*/
11-
class ProgressExampleTask extends Task implements AddInterface {
12+
class ProgressExampleTask extends Task implements AddInterface, AddFromBackendInterface {
1213

1314
/**
1415
* Timeout for run, after which the Task is reassigned to a new worker.

src/Queue/Task/RetryExampleTask.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66

77
namespace Queue\Queue\Task;
88

9+
use Queue\Queue\AddFromBackendInterface;
910
use Queue\Queue\AddInterface;
1011
use Queue\Queue\Task;
1112
use RuntimeException;
1213

1314
/**
1415
* A retry QueueTask example.
1516
*/
16-
class RetryExampleTask extends Task implements AddInterface {
17+
class RetryExampleTask extends Task implements AddInterface, AddFromBackendInterface {
1718

1819
/**
1920
* Timeout for run, after which the Task is reassigned to a new worker.

src/Queue/Task/SuperExampleTask.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66

77
namespace Queue\Queue\Task;
88

9+
use Queue\Queue\AddFromBackendInterface;
910
use Queue\Queue\AddInterface;
1011
use Queue\Queue\Task;
1112

1213
/**
1314
* A cascading QueueTask example.
1415
*/
15-
class SuperExampleTask extends Task implements AddInterface {
16+
class SuperExampleTask extends Task implements AddInterface, AddFromBackendInterface {
1617

1718
/**
1819
* Timeout for run, after which the Task is reassigned to a new worker.

0 commit comments

Comments
 (0)