Support default IOQ in weatherreport

weatherreport previously relied on Cloudant's IOQ implementation.
This adds support for the default IOQ so that it works with either.

2 files changed, 28 insertions, 1 deletions

diff --git a/src/ioq/src/ioq.erl b/src/ioq/src/ioq.erl
index 99b3ce385..3da640e47 100644
--- a/src/ioq/src/ioq.erl
+++ b/src/ioq/src/ioq.erl
@@ -15,6 +15,7 @@
 -behaviour(config_listener).
 
 -export([start_link/0, call/3]).
+-export([get_queue_lengths/0]).
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, code_change/3, terminate/2]).
 
 % config_listener api
@@ -50,6 +51,9 @@ call(Fd, Msg, Metadata) ->
             queued_call(Fd, Msg, Priority)
     end.
 
+get_queue_lengths() ->
+    gen_server:call(?MODULE, get_queue_lengths).
+
 bypass(Priority) ->
     config:get("ioq.bypass", atom_to_list(Priority)) =:= "true".
 
@@ -91,6 +95,12 @@ read_config(State) ->
     Concurrency = list_to_integer(config:get("ioq", "concurrency", "10")),
     State#state{concurrency=Concurrency, ratio=Ratio}.
 
+handle_call(get_queue_lengths, _From, State) ->
+    Response = #{
+        interactive => queue:len(State#state.interactive),
+        background => queue:len(State#state.background)
+    },
+    {reply, Response, State, 0};
 handle_call(#request{}=Request, From, State) ->
     {noreply, enqueue_request(Request#request{from=From}, State), 0}.
 
diff --git a/src/weatherreport/src/weatherreport_check_ioq.erl b/src/weatherreport/src/weatherreport_check_ioq.erl
index de0d8b155..2c25964ef 100644
--- a/src/weatherreport/src/weatherreport_check_ioq.erl
+++ b/src/weatherreport/src/weatherreport_check_ioq.erl
@@ -62,7 +62,24 @@ sum_queues([{_Name, Value} | Rest], Acc) ->
     sum_queues(Rest, Acc + Value).
 
 -spec check(list()) -> [{atom(), term()}].
-check(_Opts) ->
+check(Opts) ->
+    case erlang:function_exported(ioq, get_queue_lengths, 0) of
+        true ->
+            case ioq:get_queue_lengths() of
+                Queues when is_map(Queues) ->
+                    Total = maps:fold(fun(_Key, Val, Acc) ->
+                        Val + Acc
+                    end, 0, Queues),
+                    [{total_to_level(Total), {ioq_requests, Total, Queues}}];
+                Error ->
+                    [{warning, {ioq_requests_unknown, Error}}]
+            end;
+        false ->
+            check_legacy(Opts)
+    end.
+
+-spec check_legacy(list()) -> [{atom(), term()}].
+check_legacy(_Opts) ->
     case ioq:get_disk_queues() of
         Queues when is_list(Queues) ->
             Total = sum_queues(Queues, 0),