esl / MongooseIM / 430

pending completion

Build # 430

Build Type

Pull #341

travis-ci

Committed by

lavrin

Commit Message

<a href="https://github.com/esl/MongooseIM/commit/<a class=hub.com/esl/MongooseIM/commit/0d6507d9b487124786d8dce61fd49c51ccf65948">0d6507d9b<a href="https://github.com/esl/MongooseIM/commit/0d6507d9b487124786d8dce61fd49c51ccf65948">&quot;&gt;Fix inactivity timer not being set correctly

Don&amp;#39;t defer updating #state.handlers until after the call
to send_to_handler/3.
send_to_handler/3 calls send_wrapped_to_handler/3 which only sets up
the inactivity timer if #state.handlers is empty!

(cherry picked from commit </a><a class="double-link" href="https://github.com/esl/MongooseIM/commit/<a class="double-link" href="https://github.com/esl/MongooseIM/commit/7aeac8eddce2fbd42b5d0b8e3a77162f9fc31bde">7aeac8edd</a>">7aeac8edd</a><a href="https://github.com/esl/MongooseIM/commit/0d6507d9b487124786d8dce61fd49c51ccf65948">)

Pull Request Pull Request #341: Fix inactivity timer not being set correctly

Run Details

2 of 2 new or added lines in 1 file covered. (100.0%)

11325 of 19490 relevant lines covered (58.11%)

4580.8 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

85.71

/apps/ejabberd/src/ejabberd_redis.erl

%%%-------------------------------------------------------------------
%%% @author Michal Ptaszek <michal.ptaszek@erlang-solutions.com>
%%% @copyright (C) 2011, Erlang Solutions Ltd.
%%% @doc Redis wrapper for ejabberd
%%%
%%% @end
%%% Created : 17 Nov 2011 by Michal Ptaszek <michal.ptaszek@erlang-solutions.com>
%%%-------------------------------------------------------------------
-module(ejabberd_redis).

-export([start_link/1]).
-export([cmd/1, cmd/2]).

-define(POOL_NAME, redis_pool).

-spec start_link(list()) -> {ok, pid()}.
start_link(Opts) ->
    PoolSize = proplists:get_value(pool_size, Opts, 10),
    RedoOpts = proplists:get_value(worker_config, Opts, []),
    ChildMods = [redo, redo_redis_proto, redo_uri],
    ChildMFA = {redo, start_link, [undefined, RedoOpts]},

    supervisor:start_child(ejabberd_sm_backend_sup,
                           {ejabberd_redis_sup,
                            {cuesport, start_link,
                             [?POOL_NAME, PoolSize, ChildMods, ChildMFA]},
                            transient, 2000, supervisor, [cuesport | ChildMods]}).

-spec cmd(iolist()) -> binary()
                | [binary() | [binary() | integer()] | integer() | {'error',_}]
                | integer()
                | {'error',_}.
cmd(Cmd) ->
    redo:cmd(cuesport:get_worker(?POOL_NAME), Cmd).

-spec cmd(iolist(), integer()) -> binary()
              | [binary() | [binary() | integer()] | integer() | {'error',_}]
              | integer()
              | {'error',_}.
cmd(Cmd, Timeout) ->
    redo:cmd(cuesport:get_worker(?POOL_NAME), Cmd, Timeout).

1	%%%-------------------------------------------------------------------
2	%%% @author Michal Ptaszek <michal.ptaszek@erlang-solutions.com>
3	%%% @copyright (C) 2011, Erlang Solutions Ltd.
4	%%% @doc Redis wrapper for ejabberd
5	%%%
6	%%% @end
7	%%% Created : 17 Nov 2011 by Michal Ptaszek <michal.ptaszek@erlang-solutions.com>
8	%%%-------------------------------------------------------------------
9	-module(ejabberd_redis).
10
11	-export([start_link/1]).
12	-export([cmd/1, cmd/2]).
13
14	-define(POOL_NAME, redis_pool).
15
16	-spec start_link(list()) -> {ok, pid()}.
17	start_link(Opts) ->
18	PoolSize = proplists:get_value(pool_size, Opts, 10),	8✔
19	RedoOpts = proplists:get_value(worker_config, Opts, []),	8✔
20	ChildMods = [redo, redo_redis_proto, redo_uri],	8✔
21	ChildMFA = {redo, start_link, [undefined, RedoOpts]},	8✔
22
23	supervisor:start_child(ejabberd_sm_backend_sup,	8✔
24	{ejabberd_redis_sup,
25	{cuesport, start_link,
26	[?POOL_NAME, PoolSize, ChildMods, ChildMFA]},
27	transient, 2000, supervisor, [cuesport \| ChildMods]}).
28
29	-spec cmd(iolist()) -> binary()
30	\| [binary() \| [binary() \| integer()] \| integer() \| {'error',_}]
31	\| integer()
32	\| {'error',_}.
33	cmd(Cmd) ->
34	redo:cmd(cuesport:get_worker(?POOL_NAME), Cmd).	18,828✔
35
36	-spec cmd(iolist(), integer()) -> binary()
37	\| [binary() \| [binary() \| integer()] \| integer() \| {'error',_}]
38	\| integer()
39	\| {'error',_}.
40	cmd(Cmd, Timeout) ->
41	redo:cmd(cuesport:get_worker(?POOL_NAME), Cmd, Timeout).

esl / MongooseIM / 430

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous