Merge pull request #321 from esl/generic_http_api

Generic HTTP API
esl · Nov 28, 2014 · 41a0dd9 · 41a0dd9
2 parents db5aa6f + 561ef00
commit 41a0dd9
Show file tree

Hide file tree

Showing 13 changed files with 692 additions and 205 deletions.
diff --git a/apps/ejabberd/src/ejabberd_config.erl b/apps/ejabberd/src/ejabberd_config.erl
@@ -1263,11 +1263,11 @@ get_key_group(_, Key) when is_atom(Key)->
                     ValuePos :: non_neg_integer()) -> compare_result().
 compare_terms(OldTerms, NewTerms, KeyPos, ValuePos)
   when is_integer(KeyPos), is_integer(ValuePos) ->
-    {ToStop, ToReload} = lists:foldl(pa:binary(fun find_modules_to_change/5,
-                                               [KeyPos, NewTerms, ValuePos]),
+    {ToStop, ToReload} = lists:foldl(pa:bind(fun find_modules_to_change/5,
+                                             KeyPos, NewTerms, ValuePos),
                                      {[], []}, OldTerms),
-    ToStart = lists:foldl(pa:binary(fun find_modules_to_start/4,
-                                    [KeyPos, OldTerms]), [], NewTerms),
+    ToStart = lists:foldl(pa:bind(fun find_modules_to_start/4,
+                                  KeyPos, OldTerms), [], NewTerms),
     #compare_result{to_start  = ToStart,
                     to_stop   = ToStop,
                     to_reload = ToReload}.

diff --git a/apps/ejabberd/src/ejabberd_cowboy.erl b/apps/ejabberd/src/ejabberd_cowboy.erl
@@ -154,6 +154,7 @@ get_routes([{Host, BasePath, Module, Opts} | Tail], Routes) ->
         "_" -> '_';
         _ -> Host
     end,
+    {module, Module} = code:ensure_loaded(Module),
     Paths = proplists:get_value(CowboyHost, Routes, []) ++
     case erlang:function_exported(Module, cowboy_router_paths, 2) of
         true -> Module:cowboy_router_paths(BasePath, Opts);

diff --git a/apps/ejabberd/src/ejabberd_metrics_rest.erl b/apps/ejabberd/src/ejabberd_metrics_rest.erl
diff --git a/apps/ejabberd/src/mod_metrics.erl b/apps/ejabberd/src/mod_metrics.erl
@@ -12,17 +12,6 @@
 
 -export ([start/2, stop/1]).
 
-%% ejabberd_cowboy API
--export ([cowboy_router_paths/2]).
-
--define(REST_LISTENER, ejabberd_metrics_rest).
-
--type paths() :: 'available_metrics'
-               | 'host_metric'
-               | 'host_metrics'
-               | 'sum_metric'
-               | 'sum_metrics'.
-
 -spec start(ejabberd:server(), list()) -> ok.
 start(Host, _Opts) ->
     init_folsom(Host),
@@ -128,14 +117,3 @@ get_general_counters(Host) ->
                             [{ejabberd:server(),'sessionCount'}].
 get_total_counters(Host) ->
     [{Host, Counter} || Counter <- ?TOTAL_COUNTERS].
-
--spec cowboy_router_paths(file:filename(), list()) ->
-    [{file:filename(), 'ejabberd_metrics_rest', [paths(),...]},...].
-cowboy_router_paths(BasePath, _Opts) ->
-    [
-        {BasePath, ?REST_LISTENER, [available_metrics]},
-        {[BasePath, "/m"], ?REST_LISTENER, [sum_metrics]},
-        {[BasePath, "/m/:metric"], ?REST_LISTENER, [sum_metric]},
-        {[BasePath, "/host/:host/:metric"], ?REST_LISTENER, [host_metric]},
-        {[BasePath, "/host/:host"], ?REST_LISTENER, [host_metrics]}
-    ].