|
1 | 1 | <?php
|
2 | 2 |
|
3 |
| -function generateProgram($connection, $queue, $tries, $sleep, $numProcs, $startSecs) |
| 3 | +function generateProgram($connection, $queue, $tries, $sleep, $numProcs, $delay, $startSecs) |
4 | 4 | {
|
5 | 5 | $program = <<<EOT
|
6 | 6 |
|
7 | 7 | [program:$queue]
|
8 |
| -command=sudo php artisan doctrine:queue:work $connection --queue=$queue --tries=$tries --sleep=$sleep --daemon |
| 8 | +command=sudo php artisan doctrine:queue:work $connection --queue=$queue --tries=$tries --sleep=$sleep --delay=$delay --daemon |
9 | 9 | directory=/var/app/current/
|
10 | 10 | autostart=true
|
11 | 11 | autorestart=true
|
@@ -111,17 +111,19 @@ function getEBWorkerConfig($path)
|
111 | 111 | {
|
112 | 112 | if (strpos($key, 'queue') !== false && strpos($key, 'queue_driver') === false)
|
113 | 113 | {
|
114 |
| - $tryKey = substr($key, 10) . 'tries'; //get queue $key + tries to see if custom tries is set |
| 114 | + $tryKey = substr($key, 5) . 'tries'; //get queue $key + tries to see if custom tries is set |
115 | 115 | $sleepKey = substr($key, 5) . 'sleep'; //get queue $key + sleep to see if custom sleep is set
|
116 | 116 | $numProcKey = substr($key, 5) . 'numprocs'; //get queue $key + num process to see if custom number of processes is set
|
117 | 117 | $startSecsKey = substr($key, 5) . 'startsecs'; //get queue $key + number of seconds the process should stay up
|
| 118 | + $delayKey = substr($key, 5) . 'delay'; //get queue $key + delay in seconds before a job should re-enter the ready queue |
118 | 119 |
|
119 | 120 | $tries = isset($envVars[ $tryKey ]) ? $envVars[ $tryKey ] : 5;
|
120 | 121 | $sleep = isset($envVars[ $sleepKey ]) ? $envVars[ $sleepKey ] : 5;
|
121 | 122 | $numProcs = isset($envVars[ $numProcKey ]) ? $envVars[ $numProcKey ] : 1;
|
122 | 123 | $startSecs = isset($envVars[ $startSecsKey ]) ? $envVars[ $startSecsKey ] : 1;
|
| 124 | + $delay = isset($envVars[ $delayKey]) ? $envVars[ $delayKey ] : 0; |
123 | 125 | $connection = isset($envVars['queue_driver']) ? $envVars['queue_driver'] : 'beanstalkd';
|
124 |
| - $programs .= generateProgram($connection, $val, $tries, $sleep, $numProcs, $startSecs); |
| 126 | + $programs .= generateProgram($connection, $val, $tries, $sleep, $numProcs, $delay, $startSecs); |
125 | 127 | }
|
126 | 128 | }
|
127 | 129 | }
|
|
0 commit comments