Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2351 from TDT-AG/pr/20181204-modules

Browse source 
modules: use configurable poll interval
This commit is contained in:
Jo-Philipp Wich 2018-12-20 10:52:06 +01:00 committed by GitHub
commit 5aa2d3a77f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-adblock/luasrc/view/adblock/logread.htm
View file

@ -10,7 +10,7 @@ This is free software, licensed under the Apache License, Version 2.0
//<![CDATA[ //<![CDATA[
function log_update() function log_update()
{ {
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "logread")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "logread")%>', null,
function(x) function(x)
{ {
if (!x) if (!x)

2
applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
View file

@ -123,7 +123,7 @@ This is free software, licensed under the Apache License, Version 2.0
status_update(json_info); status_update(json_info);
}); });
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "status_update")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "status_update")%>', null,
function(x, json_info) function(x, json_info)
{ {
if (!x || !json_info || !json_info.data) if (!x || !json_info || !json_info.data)

2
applications/luci-app-ahcp/luasrc/view/ahcp_status.htm
View file

@ -1,5 +1,5 @@
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=url('admin/network/ahcpd/status')%>', null, XHR.poll(-1, '<%=url('admin/network/ahcpd/status')%>', null,
function(x, st) function(x, st)
{ {
var tb = document.getElementById('ahcpd_status_table'); var tb = document.getElementById('ahcpd_status_table');

2
applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm
View file

@ -1,5 +1,5 @@
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=luci.dispatcher.build_url("admin/services/aria2/status")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin/services/aria2/status")%>', null,
function(x, data) { function(x, data) {
var tb = document.getElementById('aria2_status'); var tb = document.getElementById('aria2_status');
if (data && tb) { if (data && tb) {

2
applications/luci-app-banip/luasrc/view/banip/logview.htm
View file

@ -10,7 +10,7 @@ This is free software, licensed under the Apache License, Version 2.0
//<![CDATA[ //<![CDATA[
function log_update() function log_update()
{ {
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "banip", "logview")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "banip", "logview")%>', null,
function(x) function(x)
{ {
if (!x) if (!x)

2
applications/luci-app-banip/luasrc/view/banip/runtime.htm
View file

@ -76,7 +76,7 @@ function btn_action(action)
status_update(json_info) status_update(json_info)
}); });
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "banip", "status")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "banip", "status")%>', null,
function(x, json_info) function(x, json_info)
{ {
if (!x || !json_info) if (!x || !json_info)

2
applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm
View file

@ -164,7 +164,7 @@
// define only ONE XHR.poll in a page because if one is running it blocks the other one // define only ONE XHR.poll in a page because if one is running it blocks the other one
// optimum is to define on Map or Section Level from here you can reach all elements // optimum is to define on Map or Section Level from here you can reach all elements
// we need update every 15 seconds only // we need update every 15 seconds only
XHR.poll(5, '<%=url([[admin]], [[services]], [[ddns]], [[status]])%>', null, XHR.poll(-1, '<%=url([[admin]], [[services]], [[ddns]], [[status]])%>', null,
function(x, data) { function(x, data) {
if (data) { _data2elements(data); } if (data) { _data2elements(data); }
} }

2
applications/luci-app-ltqtapi/luasrc/view/telephony_status.htm
View file

@ -1,5 +1,5 @@
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=url('admin/telephony/status')%>', null, XHR.poll(-1, '<%=url('admin/telephony/status')%>', null,
function(x, st) function(x, st)
{ {
var tb = document.getElementById('telephony_status_table'); var tb = document.getElementById('telephony_status_table');

2
applications/luci-app-minidlna/luasrc/view/minidlna_status.htm
View file

@ -1,5 +1,5 @@
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=url("admin/services/minidlna_status")%>', null, XHR.poll(-1, '<%=url("admin/services/minidlna_status")%>', null,
function(x, st) function(x, st)
{ {
var tb = document.getElementById('minidlna_status'); var tb = document.getElementById('minidlna_status');

2
applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm
View file

@ -5,7 +5,7 @@
-%> -%>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null,
function(x, status) function(x, status)
{ {
var statusDiv = document.getElementById('mwan_status_text'); var statusDiv = document.getElementById('mwan_status_text');

2
applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm
View file

@ -14,7 +14,7 @@
</ul> </ul>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null,
function(x) function(x)
{ {
var output = document.getElementById('diag-rc-output'); var output = document.getElementById('diag-rc-output');

2
applications/luci-app-ocserv/luasrc/view/ocserv_status.htm
View file

@ -11,7 +11,7 @@
); );
} }
XHR.poll(5, '<%=url('admin/services/ocserv/status')%>', null, XHR.poll(-1, '<%=url('admin/services/ocserv/status')%>', null,
function(x, st) function(x, st)
{ {
var tb = document.getElementById('ocserv_status_table'); var tb = document.getElementById('ocserv_status_table');

2
applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm
View file

@ -26,7 +26,7 @@
); );
} }
XHR.poll(5, '<%=url('admin/services/privoxy/status')%>', null, XHR.poll(-1, '<%=url('admin/services/privoxy/status')%>', null,
function(x, data) { _data2elements(x); } function(x, data) { _data2elements(x); }
); );

2
applications/luci-app-radicale/luasrc/view/radicale/btn_startstop.htm
View file

@ -26,7 +26,7 @@
); );
} }
XHR.poll(5, '<%=url([[admin/services/radicale/status]])%>', null, XHR.poll(-1, '<%=url([[admin/services/radicale/status]])%>', null,
function(x, data) { _data2elements(x); } function(x, data) { _data2elements(x); }
); );

2
applications/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm
View file

@ -14,7 +14,7 @@
<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>" value="<%:Add%>" /> <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>" value="<%:Add%>" />
</div> </div>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=url('admin/services/shadowsocks-libev/status')%>', null, XHR.poll(-1, '<%=url('admin/services/shadowsocks-libev/status')%>', null,
function(x, st) function(x, st)
{ {
var names = [ var names = [

2
applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm
View file

@ -10,7 +10,7 @@ This is free software, licensed under the Apache License, Version 2.0
//<![CDATA[ //<![CDATA[
function log_update() function log_update()
{ {
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "travelmate", "logread")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "travelmate", "logread")%>', null,
function(x) function(x)
{ {
if (!x) if (!x)

2
applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm
View file

@ -84,7 +84,7 @@ This is free software, licensed under the Apache License, Version 2.0
status_update(json_info) status_update(json_info)
}); });
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "travelmate", "status")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "travelmate", "status")%>', null,
function(x, json_info) function(x, json_info)
{ {
if (!x || !json_info) if (!x || !json_info)

2
applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
View file

@ -86,7 +86,7 @@ This is free software, licensed under the Apache License, Version 2.0
status_update(json_info) status_update(json_info)
}); });
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "travelmate", "status")%>', null, XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "travelmate", "status")%>', null,
function(x, json_info) function(x, json_info)
{ {
if (!x || !json_info) if (!x || !json_info)

2
applications/luci-app-upnp/luasrc/view/upnp_status.htm
View file

@ -10,7 +10,7 @@
); );
} }
XHR.poll(5, '<%=url('admin/services/upnp/status')%>', null, XHR.poll(-1, '<%=url('admin/services/upnp/status')%>', null,
function(x, st) function(x, st)
{ {
var tb = document.getElementById('upnp_status_table'); var tb = document.getElementById('upnp_status_table');

2
applications/luci-app-wireguard/luasrc/view/wireguard.htm
View file

@ -113,7 +113,7 @@
} }
} }
XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 }, XHR.poll(-1, '<%=REQUEST_URI%>', { status: 1 },
function(x, data) { function(x, data) {
for (var key in data) { for (var key in data) {
if (!data.hasOwnProperty(key)) { continue; } if (!data.hasOwnProperty(key)) { continue; }

4
modules/luci-base/htdocs/luci-static/resources/xhr.js
View file

@ -169,8 +169,8 @@ XHR.post = function(url, data, callback) {
} }
XHR.poll = function(interval, url, data, callback, post) { XHR.poll = function(interval, url, data, callback, post) {
if (isNaN(interval) || interval < 1) if (isNaN(interval) || interval <= 0)
interval = 5; interval = L.env.pollinterval;
if (!XHR._q) { if (!XHR._q) {
XHR._t = 0; XHR._t = 0;

3
modules/luci-base/luasrc/view/header.htm
View file

@ -18,6 +18,7 @@
resource = resource, resource = resource,
scriptname = luci.http.getenv("SCRIPT_NAME"), scriptname = luci.http.getenv("SCRIPT_NAME"),
pathinfo = luci.http.getenv("PATH_INFO"), pathinfo = luci.http.getenv("PATH_INFO"),
requestpath = luci.dispatcher.context.requestpath requestpath = luci.dispatcher.context.requestpath,
pollinterval = luci.config.main.pollinterval or 5
}) %>); }) %>);
</script> </script>

2
modules/luci-base/luasrc/view/lease_status.htm
View file

@ -1,5 +1,5 @@
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=url('admin/dhcplease_status')%>', null, XHR.poll(-1, '<%=url('admin/dhcplease_status')%>', null,
function(x, st) function(x, st)
{ {
var tb = document.getElementById('lease_status_table'); var tb = document.getElementById('lease_status_table');

2
modules/luci-base/luasrc/view/wifi_assoclist.htm
View file

@ -44,7 +44,7 @@
}); });
} }
XHR.poll(5, '<%=url('admin/wireless_assoclist')%>', null, XHR.poll(-1, '<%=url('admin/wireless_assoclist')%>', null,
function(x, st) function(x, st)
{ {
var tb = document.getElementById('wifi_assoclist_table'); var tb = document.getElementById('wifi_assoclist_table');

2
modules/luci-mod-network/luasrc/view/admin_network/switch_status.htm
View file

@ -21,7 +21,7 @@
return status_row; return status_row;
} }
XHR.poll(5, '<%=url('admin/network/switch_status')%>/' + switches.join(','), null, XHR.poll(-1, '<%=url('admin/network/switch_status')%>/' + switches.join(','), null,
function(x, st) function(x, st)
{ {
for (var i = 0; i < switches.length; i++) for (var i = 0; i < switches.length; i++)

2
modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm
View file

@ -1,7 +1,7 @@
<%+cbi/valueheader%> <%+cbi/valueheader%>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=url('admin/system/clock_status')%>', null, XHR.poll(-1, '<%=url('admin/system/clock_status')%>', null,
function(x, rv) function(x, rv)
{ {
var s = document.getElementById('<%=self.option%>-clock-status'); var s = document.getElementById('<%=self.option%>-clock-status');