diff options
author | moisseev <moiseev@mezonplus.ru> | 2022-04-18 18:20:00 +0300 |
---|---|---|
committer | moisseev <moiseev@mezonplus.ru> | 2022-04-18 18:20:00 +0300 |
commit | 2f972ee4c974d84c7bad3d7dd6b4a7a327c9d089 (patch) | |
tree | 8c347ea4cc98d26e9106683fc2f42ddda56b528f /interface/js | |
parent | 27cea48502b50c4ed8f9f56ed7daeecbb80e9ebf (diff) | |
download | rspamd-2f972ee4c974d84c7bad3d7dd6b4a7a327c9d089.tar.gz rspamd-2f972ee4c974d84c7bad3d7dd6b4a7a327c9d089.zip |
[WebUI] Add HTTP (Ajax) request timeout setting
Issue: #4009
Diffstat (limited to 'interface/js')
-rw-r--r-- | interface/js/app/rspamd.js | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/interface/js/app/rspamd.js b/interface/js/app/rspamd.js index a8a904fd3..b440022e4 100644 --- a/interface/js/app/rspamd.js +++ b/interface/js/app/rspamd.js @@ -51,6 +51,9 @@ function ($, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_config, } }; + const defaultAjaxTimeout = 20000; + + const ajaxTimeoutBox = ".popover #settings-popover #ajax-timeout"; var graphs = {}; var tables = {}; var neighbours = []; // list of clusters @@ -64,6 +67,17 @@ function ($, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_config, showSpinner: false, }); + function ajaxSetup(ajax_timeout, setFieldValue, saveToLocalStorage) { + const timeout = (ajax_timeout && ajax_timeout >= 0) ? ajax_timeout : defaultAjaxTimeout; + if (saveToLocalStorage) localStorage.setItem("ajax_timeout", timeout); + if (setFieldValue) $(ajaxTimeoutBox).val(timeout); + + $.ajaxSetup({ + timeout: timeout, + jsonp: false + }); + } + function cleanCredentials() { sessionStorage.clear(); $("#statWidgets").empty(); @@ -295,6 +309,8 @@ function ($, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_config, if (!ui.read_only) tab_selectors.displayUI(ui); }, complete: function () { + ajaxSetup(localStorage.getItem("ajax_timeout")); + if (ui.read_only) { $(".ro-disable").attr("disabled", true); $(".ro-hide").hide(); @@ -466,6 +482,8 @@ function ($, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_config, $('.popover #settings-popover input:radio[name="locale"]').val([selected_locale]); $(localeTextbox).val(custom_locale); + + ajaxSetup(localStorage.getItem("ajax_timeout"), true); }); $(document).on("change", '.popover #settings-popover input:radio[name="locale"]', function () { selected_locale = this.value; @@ -476,6 +494,12 @@ function ($, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_config, custom_locale = $(localeTextbox).val(); validateLocale(true); }); + $(document).on("input", ajaxTimeoutBox, function () { + ajaxSetup($(ajaxTimeoutBox).val(), false, true); + }); + $(document).on("click", ".popover #settings-popover #ajax-timeout-restore", function () { + ajaxSetup(null, true, true); + }); // Dismiss Bootstrap popover by clicking outside $("body").on("click", function (e) { @@ -495,10 +519,6 @@ function ($, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_config, selData = this.value; tabClick("#throughput_nav"); }); - $.ajaxSetup({ - timeout: 20000, - jsonp: false - }); $(document).ajaxStart(function () { $("#refresh > svg").addClass("fa-spin"); @@ -549,6 +569,11 @@ function ($, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_config, }; ui.connect = function () { + // Prevent locking out of the WebUI if timeout is too low. + let timeout = localStorage.getItem("ajax_timeout"); + if (timeout < defaultAjaxTimeout) timeout = defaultAjaxTimeout; + ajaxSetup(timeout); + // Query "/stat" to check if user is already logged in or client ip matches "secure_ip" $.ajax({ type: "GET", |