Synchronize default job timeout setting with quiz archive worker and …

…add hint about the additional timeout inside the archive worker config
ngandrass · Jul 4, 2024 · 4dc47d3 · 4dc47d3
1 parent bd46b3a
commit 4dc47d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/lang/de/quiz_archiver.php b/lang/de/quiz_archiver.php
@@ -175,8 +175,7 @@
 $string['setting_internal_wwwroot'] = 'Eigene Moodle Basis-URL';
 $string['setting_internal_wwwroot_desc'] = 'Überschreibt die Moodle Basis-URL (<code>$CFG->wwwroot</code>) in den erzeugten Versuchs-Berichten. Dies kann nützlich sein, wenn der Archive Worker Service innerhalb eines privaten Netzwerks (z.B. Docker) läuft und er über das private Netzwerk auf Moodle zugreifen soll.<br/>Beispiel: <code>http://moodle/</code>';
 $string['setting_job_timeout_min'] = 'Auftrags Zeitlimit (Minuten)';
-$string['setting_job_timeout_min_desc'] = 'The number of minutes a single archive job is allowed to run before it is aborted by Moodle. Job web service access tokens become invalid after this timeout.';
-$string['setting_job_timeout_min_desc'] = 'Die maximale Laufzeit eines einzelnen Archivierungsauftrags in Minuten, bevor er durch Moodle abgebrochen wird. Das Webservice Zugriffstoken des Auftrags wird nach diesem Zeitlimit invalidiert.';
+$string['setting_job_timeout_min_desc'] = 'Die maximale Laufzeit eines einzelnen Archivierungsauftrags in Minuten, bevor er durch Moodle abgebrochen wird. Das Webservice Zugriffstoken des Auftrags wird nach diesem Zeitlimit invalidiert.<br/>Hinweis: Dieses Zeitlimit kann das im Archive Worker Service konfigurierte Zeitlimit nicht überschreiten. Das kürzere Zeitlimit hat stets Vorrang.';
 $string['setting_tsp_automatic_signing'] = 'Testarchive automatisch signieren';
 $string['setting_tsp_automatic_signing_desc'] = 'Testarchive automatisch bei der Erstellung signieren.';
 $string['setting_tsp_enable'] = 'Signierung aktivieren';

diff --git a/lang/en/quiz_archiver.php b/lang/en/quiz_archiver.php
@@ -174,7 +174,7 @@
 $string['setting_internal_wwwroot'] = 'Custom Moodle base URL';
 $string['setting_internal_wwwroot_desc'] = 'Overwrites the default Moodle base URL (<code>$CFG->wwwroot</code>) inside generated reports. This can be useful if you are running the archive worker service inside a private network (e.g., Docker) and want it to access Moodle directly.<br/>Example: <code>http://moodle/</code>';
 $string['setting_job_timeout_min'] = 'Job timeout (minutes)';
-$string['setting_job_timeout_min_desc'] = 'The number of minutes a single archive job is allowed to run before it is aborted by Moodle. Job web service access tokens become invalid after this timeout.';
+$string['setting_job_timeout_min_desc'] = 'The number of minutes a single archive job is allowed to run before it is aborted by Moodle. Job web service access tokens become invalid after this timeout.<br/>Note: This timeout can not exceed the timeout configured within the archive worker service. The shorter timeout always takes precedence.';
 $string['setting_tsp_automatic_signing'] = 'Automatically sign quiz archives';
 $string['setting_tsp_automatic_signing_desc'] = 'Automatically sign quiz archives when they are created.';
 $string['setting_tsp_enable'] = 'Enable quiz archive signing';

diff --git a/settings.php b/settings.php
@@ -90,7 +90,7 @@
         $settings->add(new admin_setting_configtext('quiz_archiver/job_timeout_min',
             get_string('setting_job_timeout_min', 'quiz_archiver'),
             get_string('setting_job_timeout_min_desc', 'quiz_archiver'),
-            '120',
+            '60',
             PARAM_INT
         ));