Merge remote-tracking branch 'processone/pr/360'

* processone/pr/360:
  mod_spam_filter: domains node can not be `none`
  mod_spam_filter: cancel existing timer on reload or terminate

Author: weiss

mod_spam_filter/src/mod_spam_filter.erl

@@ -160,9 +160,7 @@ mod_opt_type(rtbl_host) ->
       econf:enum([none]),
       econf:host());
 mod_opt_type(rtbl_domains_node) ->
-    econf:either(
-      none,
-      econf:binary()).
+    econf:non_empty(econf:binary()).
 
 -spec mod_options(binary()) -> [{atom(), any()}].
 mod_options(_Host) ->
@@ -295,7 +293,9 @@ handle_cast({dump, XML}, #state{dump_fd = Fd} = State) ->
 handle_cast({reload, NewOpts, OldOpts},
 	    #state{host = Host,
 		   rtbl_host = OldRTBLHost,
-		   rtbl_domains_node = OldRTBLDomainsNode} = State) ->
+		   rtbl_domains_node = OldRTBLDomainsNode,
+		   rtbl_retry_timer = RTBLRetryTimer} = State) ->
+    misc:cancel_timer(RTBLRetryTimer),
     State1 = case {gen_mod:get_opt(spam_dump_file, OldOpts),
 		   gen_mod:get_opt(spam_dump_file, NewOpts)} of
 		 {OldDumpFile, NewDumpFile} when NewDumpFile /= OldDumpFile ->
@@ -375,8 +375,13 @@ handle_info(Info, State) ->
     {noreply, State}.
 
 -spec terminate(normal | shutdown | {shutdown, term()} | term(), state()) -> ok.
-terminate(Reason, #state{host = Host, rtbl_host = RTBLHost, rtbl_domains_node = RTBLDomainsNode} = State) ->
+terminate(Reason,
+	  #state{host = Host,
+		 rtbl_host = RTBLHost,
+		 rtbl_domains_node = RTBLDomainsNode,
+		 rtbl_retry_timer = RTBLRetryTimer} = State) ->
     ?DEBUG("Stopping spam filter process for ~s: ~p", [Host, Reason]),
+    misc:cancel_timer(RTBLRetryTimer),
     DumpFile = gen_mod:get_module_opt(Host, ?MODULE, spam_dump_file),
     DumpFile1 = expand_host(DumpFile, Host),
     close_dump_file(DumpFile1, State),
@@ -679,7 +684,7 @@ read_files(Files) ->
 -spec line_parser(Type :: atom()) -> fun((binary()) -> binary()).
 line_parser(jid) -> fun parse_jid/1;
 line_parser(url) -> fun parse_url/1;
-line_parser(_)   -> fun trim/1.			   
+line_parser(_)   -> fun trim/1.
 
 -spec read_file(filename(), fun((binary()) -> ljid() | url()))
       -> jid_set() | url_set().
@@ -934,7 +939,7 @@ get_commands_spec() ->
 			args = [{host, binary}, {domain, binary}],
 			result = {res, restuple}}
     ].
-    
+
 for_all_hosts(F, A) ->
     try lists:map(
 	  fun(Host) ->
@@ -968,13 +973,13 @@ reload_spam_filter_files(Host) ->
     LServer = jid:nameprep(Host),
     Files = #{domains => gen_mod:get_module_opt(LServer, ?MODULE, spam_domains_file),
 	      jid => gen_mod:get_module_opt(LServer, ?MODULE, spam_jids_file),
-	      url => gen_mod:get_module_opt(LServer, ?MODULE, spam_urls_file)},							     
+	      url => gen_mod:get_module_opt(LServer, ?MODULE, spam_urls_file)},
     case try_call_by_host(Host, {reload_files, Files}) of
 	{spam_filter, ok} ->
 	    ok;
 	{spam_filter, {error, Txt}} ->
 	    {error, binary_to_list(Txt)};
-	{error, _R} = Error -> 
+	{error, _R} = Error ->
 	    Error
     end.
 
@@ -1031,7 +1036,7 @@ expire_spam_filter_cache(Host, Age) ->
 	    Error
     end.
 
--spec add_to_spam_filter_cache(binary(), binary()) -> [{binary(), integer()}] | {error, string()}. 
+-spec add_to_spam_filter_cache(binary(), binary()) -> [{binary(), integer()}] | {error, string()}.
 add_to_spam_filter_cache(<<"global">>, JID) ->
     for_all_hosts(fun add_to_spam_filter_cache/2, [JID]);
 add_to_spam_filter_cache(Host, EncJID) ->

mod_spam_filter/src/mod_spam_filter_rtbl.erl

@@ -56,7 +56,7 @@ parse_blocked_domains(#iq{to = #jid{lserver = LServer}, type = result} = IQ) ->
 
 -spec parse_pubsub_event(stanza()) -> #{binary() => any()}.
 parse_pubsub_event(#message{to = #jid{lserver = LServer}} = Msg) ->
-    RTBLDomainsNode = gen_mod:get_module_opt(LServer, ?SERVICE_MODULE, rtbl_domains_node),    
+    RTBLDomainsNode = gen_mod:get_module_opt(LServer, ?SERVICE_MODULE, rtbl_domains_node),
     case xmpp:get_subtag(Msg, #ps_event{}) of
 	#ps_event{items = #ps_items{node = RTBLDomainsNode, retract = ID}} when ID /= undefined ->
 	    ?DEBUG("Got item to retract:~n~p", [ID]),