This reverts commit e4f459ef31
.
tags/3.0
@@ -98,7 +98,7 @@ struct rspamd_monitored { | |||
INIT_LOG_MODULE(monitored) | |||
inline void | |||
static inline void | |||
rspamd_monitored_propagate_error (struct rspamd_monitored *m, | |||
const gchar *error) | |||
{ |
@@ -148,14 +148,6 @@ void rspamd_monitored_stop (struct rspamd_monitored *m); | |||
*/ | |||
void rspamd_monitored_start (struct rspamd_monitored *m); | |||
/** | |||
* Propagate external monitored error | |||
* @param m | |||
* @param error | |||
*/ | |||
void rspamd_monitored_propagate_error (struct rspamd_monitored *m, | |||
const gchar *error); | |||
/** | |||
* Destroy monitored context and all monitored objects inside | |||
* @param ctx |
@@ -912,14 +912,12 @@ LUA_FUNCTION_DEF (monitored, alive); | |||
LUA_FUNCTION_DEF (monitored, latency); | |||
LUA_FUNCTION_DEF (monitored, offline); | |||
LUA_FUNCTION_DEF (monitored, total_offline); | |||
LUA_FUNCTION_DEF (monitored, propagate_error); | |||
static const struct luaL_reg monitoredlib_m[] = { | |||
LUA_INTERFACE_DEF (monitored, alive), | |||
LUA_INTERFACE_DEF (monitored, latency), | |||
LUA_INTERFACE_DEF (monitored, offline), | |||
LUA_INTERFACE_DEF (monitored, total_offline), | |||
LUA_INTERFACE_DEF (monitored, propagate_error), | |||
{"__tostring", rspamd_lua_class_tostring}, | |||
{NULL, NULL} | |||
}; | |||
@@ -4633,23 +4631,6 @@ lua_monitored_latency (lua_State *L) | |||
return 1; | |||
} | |||
static gint | |||
lua_monitored_propagate_error (lua_State *L) | |||
{ | |||
LUA_TRACE_POINT; | |||
struct rspamd_monitored *m = lua_check_monitored (L, 1); | |||
const gchar *what = luaL_checkstring (L, 2); | |||
if (m && what) { | |||
rspamd_monitored_propagate_error (m, what); | |||
} | |||
else { | |||
return luaL_error (L, "invalid arguments"); | |||
} | |||
return 0; | |||
} | |||
void | |||
luaopen_config (lua_State * L) | |||
{ |
@@ -228,9 +228,6 @@ local function rbl_dns_process(task, rbl, to_resolve, results, err, resolve_tabl | |||
rspamd_logger.infox(task, 'error looking up %s: %s', to_resolve, err) | |||
task:insert_result(rbl.symbol .. '_FAIL', 1, string.format('%s:%s', | |||
resolve_table_elt.orig, err)) | |||
if rbl.monitored then | |||
rbl.monitored:propagate_error(err) | |||
end | |||
return | |||
end | |||