Make GC on exit configurable

tersmitten · tersmitten · commit b2b74933d4f1 · 2020-08-17T15:59:33.000+02:00
diff --git a/Console/Command/QueueShell.php b/Console/Command/QueueShell.php
@@ -82,7 +82,8 @@ public function initialize() {
 					'defaultWorkerRetries' => 4,
 					'workerMaxRuntime' => 0,
 					'cleanupTimeout' => DAY,
-					'exitWhenNothingToDo' => false
+					'exitWhenNothingToDo' => false,
+					'gcOnExit' => true,
 				],
 				$conf
 			)
@@ -273,7 +274,7 @@ public function runworker() {
 					));
 				}
 
-				if (rand(0, 100) > (100 - Configure::read('Queue.gcprop'))) {
+				if (($this->_exit && Configure::read('Queue.gcOnExit')) || rand(0, 100) > (100 - Configure::read('Queue.gcprop'))) {
 					$this->out(__d('queue', 'Performing old job cleanup.'));
 					$this->QueuedTask->cleanOldJobs($this->_getTaskConf());
 				}
diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@ Configure::write('Queue.defaultWorkerRetries', 4);
 Configure::write('Queue.workerMaxRuntime', 0);
 Configure::write('Queue.cleanupTimeout', DAY);
 Configure::write('Queue.exitWhenNothingToDo', false);
+Configure::write('Queue.gcOnExit', true);
 ```
 
 Load schema:

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ public function initialize() {`
`82`	`82`	`'defaultWorkerRetries' => 4,`
`83`	`83`	`'workerMaxRuntime' => 0,`
`84`	`84`	`'cleanupTimeout' => DAY,`
`85`		`- 'exitWhenNothingToDo' => false`
	`85`	`+ 'exitWhenNothingToDo' => false,`
	`86`	`+ 'gcOnExit' => true,`
`86`	`87`	`],`
`87`	`88`	`$conf`
`88`	`89`	`)`
`@@ -273,7 +274,7 @@ public function runworker() {`
`273`	`274`	`));`
`274`	`275`	`}`
`275`	`276`
`276`		`- if (rand(0, 100) > (100 - Configure::read('Queue.gcprop'))) {`
	`277`	`+ if (($this->_exit && Configure::read('Queue.gcOnExit')) \|\| rand(0, 100) > (100 - Configure::read('Queue.gcprop'))) {`
`277`	`278`	`$this->out(__d('queue', 'Performing old job cleanup.'));`
`278`	`279`	`$this->QueuedTask->cleanOldJobs($this->_getTaskConf());`
`279`	`280`	`}`