summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-04-11 09:52:25 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-04-12 09:16:44 +0200
commitaecfcf64c476151e290df28ded732bf72f7b7131 (patch)
tree670a98cec284ef11c6d8b8abd4ec8a8dedf5a953 /lib
parent3e0f1068767688b00d510955f305f92752765dcf (diff)
downloadnextcloud-server-aecfcf64c476151e290df28ded732bf72f7b7131.tar.gz
nextcloud-server-aecfcf64c476151e290df28ded732bf72f7b7131.zip
Catch the AutoloadNotAllowedException also for legacy jobs
* same as #18839 for legacy jobs * avoids spamming the log with useless entries
Diffstat (limited to 'lib')
-rw-r--r--lib/private/backgroundjob/legacy/regularjob.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/private/backgroundjob/legacy/regularjob.php b/lib/private/backgroundjob/legacy/regularjob.php
index 8e8b6634c11..aedd6ef657a 100644
--- a/lib/private/backgroundjob/legacy/regularjob.php
+++ b/lib/private/backgroundjob/legacy/regularjob.php
@@ -22,10 +22,17 @@
namespace OC\BackgroundJob\Legacy;
+use OCP\AutoloadNotAllowedException;
+
class RegularJob extends \OC\BackgroundJob\Job {
public function run($argument) {
- if (is_callable($argument)) {
- call_user_func($argument);
+ try {
+ if (is_callable($argument)) {
+ call_user_func($argument);
+ }
+ } catch (AutoloadNotAllowedException $e) {
+ // job is from a disabled app, ignore
+ return null;
}
}
}