diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2019-09-11 10:42:26 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2019-09-11 10:42:26 +0300 |
| commit | e31ec88c07621cf52283490e5ffc7935308d00d5 (patch) | |
| tree | 86b52a7a21a4430cea823e45d4da35b397ef3968 /config | |
| parent | a1cba093124040a6ea1b9695af9de3293c229723 (diff) | |
Allow configuration of max execution time (#14858)
* allow configuration of max execution time
* trigger event when query time exceeded
* fix screenshot test
* added some tests and mention mariadb not supported
Diffstat (limited to 'config')
| -rwxr-xr-x | config/global.ini.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index 74e3e306a9..e874b68b66 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -548,6 +548,12 @@ live_widget_visitor_count_last_minutes = 3 ; this limit can be adjusted by changing this value live_visitor_profile_max_visits_to_aggregate = 100 +; If configured, will abort a MySQL query after the configured amount of seconds and show an error in the UI to for +; example lower the date range or tweak the segment (if one is applied). Set it to -1 if the query time should not be +; limited. Note: This feature requires a recent MySQL version (5.7 or newer). Some MySQL forks like MariaDB might not +; support this feature which uses the MAX_EXECUTION_TIME hint. +live_query_max_execution_time = -1 + ; In "All Websites" dashboard, when looking at today's reports (or a date range including today), ; the page will automatically refresh every 5 minutes. Set to 0 to disable automatic refresh multisites_refresh_after_seconds = 300 |