Software `/` code `/` prosody

Annotate

util/watchdog.lua @ 10851:6cf16abd0976

net.server_select: Ensure onconnect is always called before onincoming This changes the code to call onconnect when the first data is sucessfully read or written, instead of simply when the socket first becomes writable. A writable socket can mean a connection error, and if the client already sent some data it may get passed to onincoming before processing writable sockets. This fixes the issue.

author	Matthew Wild <mwild1@gmail.com>
date	Mon, 01 Jun 2020 13:38:47 +0100
parent	8555:4f0f5b49bb03
child	12545:5059a639f61e

rev	line source
4401 0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 local timer = require "util.timer";
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	2 local setmetatable = setmetatable;
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	3 local os_time = os.time;
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	4
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 4891 diff changeset	5 local _ENV = nil;
8555 4f0f5b49bb03 vairious: Add annotation when an empty environment is set [luacheck] Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	6 -- luacheck: std none
4401 0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	7
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	8 local watchdog_methods = {};
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	9 local watchdog_mt = { __index = watchdog_methods };
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	10
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 4891 diff changeset	11 local function new(timeout, callback)
4401 0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 local watchdog = setmetatable({ timeout = timeout, last_reset = os_time(), callback = callback }, watchdog_mt);
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	13 timer.add_task(timeout+1, function (current_time)
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	14 local last_reset = watchdog.last_reset;
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	15 if not last_reset then
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	16 return;
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	17 end
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	18 local time_left = (last_reset + timeout) - current_time;
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	19 if time_left < 0 then
4891 189cfe565d03 util.watchdog: Pass watchdog object to callback so that it doesn't always have to be a closure Matthew Wild <mwild1@gmail.com> parents: 4401 diff changeset	20 return watchdog:callback();
4401 0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	21 end
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	22 return time_left + 1;
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	23 end);
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	24 return watchdog;
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	25 end
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	26
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	27 function watchdog_methods:reset()
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	28 self.last_reset = os_time();
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	29 end
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	30
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	31 function watchdog_methods:cancel()
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	32 self.last_reset = nil;
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	33 end
0ed617f58404 util.watchdog: Watchdog timer library Matthew Wild <mwild1@gmail.com> parents: diff changeset	34
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 4891 diff changeset	35 return {
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 4891 diff changeset	36 new = new;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 4891 diff changeset	37 };

prosody

6cf16abd0976

util/watchdog.lua

Software / code / prosody

Annotate

util/watchdog.lua @ 10851:6cf16abd0976

Software `/` code `/` prosody