* src/shaper.erl: Bugfix (EJAB-350)

* src/ejabberd_config.erl: Likewise SVN Revision: 911
16 years ago · c3dc5c929f
parent 69f83f4bf1
commit c3dc5c929f
3 changed files with 9 additions and 3 deletions
--- a/5
+++ b/5
@ -49,6 +49,11 @@
  	 	
 	* src/web/ejabberd_http_poll.erl: Bugfix

+2006-10-01  Alexey Shchepin  <alexey@sevcom.net>
+ 
+	* src/shaper.erl: Bugfix
+	* src/ejabberd_config.erl: Likewise
+
 2006-09-27  Mickael Remond  <mickael.remond@process-one.net>

 	* doc/release_notes_1.1.2.txt: Minor fixes.
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@ -113,8 +113,9 @@ process_term(Term, State) ->
 	{access, RuleName, Rules} ->
 	    process_host_term(Term, global, State);
 	{shaper, Name, Data} ->
-	    lists:foldl(fun(Host, S) -> process_host_term(Term, Host, S) end,
-			State, State#state.hosts);
+	    %lists:foldl(fun(Host, S) -> process_host_term(Term, Host, S) end,
+	    %		State, State#state.hosts);
+	    process_host_term(Term, global, State);
 	{host, Host} ->
 	    State;
 	{hosts, Hosts} ->
--- a/src/shaper.erl
+++ b/src/shaper.erl
@ -16,7 +16,7 @@


 new(Name) ->
-    Data = case ejabberd_config:get_global_option({shaper, Name}) of
+    Data = case ejabberd_config:get_global_option({shaper, Name, global}) of
 	       undefined ->
 		   none;
 	       D ->