MongooseIM 2.0.1 #1160

michalwski · 2017-01-20T08:00:34Z

This release includes:

extended REST API for clients
- support for SSE: SSE for REST API clients #1043, Adding SSE for groupchats #1131
improvements to XEP-0016 Privacy Lists: Make privacy list message blocking incoming only #1084
improvements to XEP-0191 Blocking Command: Blocking cmds fix #1122
XEP-0045 Multi-User Chat optimisations:
- Erlang process hibernation: Hibernate MUC processes #1086
- Stopping room's process if not actively used Stop hibernated room #1095
support for XEP-363 Implement XEP-0363 HTTP Upload. #1139
ODBC backend for MUC Light MUC Light ODBC #1093
Cassandra backend for MAM:
- restored Cassandra backend: Add cassandra MAM backend #1117
- migration to cqerl: Muc light loop fix #1147
- performance improvements: Improve cassandra MAM backend performance #1133
- migration tool for Cassandra backends in MongooseIM 1.6.2 Feature/cassandra schema converter #1159
other improvements:
- simplified MAM configuration Simplify MAM configuration #1112
- fix for race condition in session manager Fix race condition in ejabberd_sm #1141
- migration to p1_mysql migrating from mysql to p1_mysql #1067
- migration to p1_pgsql migrating pgsql driver to p1_pgsql #1074
- migration to fast_tls tls library migration to fast_tls #1078
- improved subdomain handling Improved subdomain handling with dedicated registry #1116
- complete list of merged PRs
- complete list of closed issues

Special thanks to our contributors: @kenstir, @sstrigler, @igors, @bernardd, @msantos

This release repo history

…uration

It was just Rows before

Muc light loop fix

Feature/cassandra schema converter

gadgetci · 2017-01-20T08:00:39Z

apps/ejabberd/src/amp.erl



 %% The lists are guaranteed to be non-empty and of equal
 %% length by make_error_message/4
-spec make_error_el([amp_error()],[amp_any_rule()]) -> #xmlel{}.
+-spec make_error_el([amp_error()], [amp_any_rule()]) -> #xmlel{}.


According to Elvis:

The spec in line 101 uses a record, please define a type for the record and use that instead.

gadgetci · 2017-01-20T08:00:40Z

apps/ejabberd/src/ejabberd_admin.erl

@@ -567,7 +566,7 @@ mnesia_change_nodename(FromString, ToString, Source, Target) ->
        fun
            ({schema, db_nodes, Nodes}, Acc) ->
                io:format(" +++ db_nodes ~p~n", [Nodes]),


According to Elvis:

Remove the debug call to io:format/2 on line 568.

gadgetci · 2017-01-20T08:00:41Z

apps/ejabberd/src/amp.erl

@@ -119,7 +119,7 @@ rule_to_xmlel(#amp_rule{condition=C, value=V, action=A}) ->
 rule_to_xmlel(#amp_invalid_rule{condition=C, value=V, action=A}) ->
    #xmlel{name = <<"rule">>,
           attrs = [{<<"condition">>, C},
-                    {<<"value">>,V},
+                    {<<"value">>, V},
                    {<<"action">>, A}]}.

 -spec strip_amp_el(#xmlel{}) -> #xmlel{}.


According to Elvis:

The spec in line 125 uses a record, please define a type for the record and use that instead.

gadgetci · 2017-01-20T08:00:42Z

apps/ejabberd/src/dynamic_compile.erl

@@ -120,19 +120,19 @@ scan_and_parse(RemainingText, CurrFilename, CurrLine, RevForms, MacroDict, Inclu
                {ok, Form} = erl_parse:parse_form(Toks),
                scan_and_parse(NRemainingText, CurrFilename, NLine, [Form | RevForms], MacroDict, IncludeSearchPath);


According to Elvis:

Line 121 is too long: scan_and_parse(NRemainingText, CurrFilename, NLine, [Form | RevForms], MacroDict, IncludeSearchPath);.

gadgetci · 2017-01-20T08:00:43Z

apps/ejabberd/src/cyrsasl.erl

@@ -119,7 +119,7 @@ listmech(Host) ->
                                 [{'==', '$2', plain}];
                             scram ->
                                 [{'/=', '$2', digest}];
-                             {'EXIT',{undef,[{Module,store_type,[]} | _]}} ->
+                             {'EXIT', {undef, [{Module, store_type, []} | _]}} ->
                                 ?WARNING_MSG("~p doesn't implement the function store_type/0", [Module]),


According to Elvis:

Line 123 is too long: ?WARNING_MSG("~p doesn't implement the function store_type/0", [Module]),.

gadgetci · 2017-01-20T08:00:44Z

apps/ejabberd/src/dynamic_compile.erl

        {include, NLine, NRemainingText, IncludeFilename} ->
            IncludeFileRemainingTextents = read_include_file(IncludeFilename, IncludeSearchPath),
-            %%io:format("include file ~p contents: ~n~p~nRemainingText = ~p~n", [IncludeFilename,IncludeFileRemainingTextents, RemainingText]),
+            %%io:format("include file ~p contents: ~n~p~nRemainingText = ~p~n", [IncludeFilename, IncludeFileRemainingTextents, RemainingText]),


According to Elvis:

Line 126 is too long: %%io:format("include file ~~p contents: np~~nRemainingText = pn", [IncludeFilename, IncludeFileRemainingTextents, RemainingText]),.

gadgetci · 2017-01-20T08:00:45Z

apps/ejabberd/src/dynamic_compile.erl

            {macro, dict:store(Name, macro_params_body_def(Macro, []), MacroDict)}
    end;
-pre_proc([{'-',_}, {atom,_,include}, {'(',_}, {string,_,Filename}, {')',_}, {dot,_}], _MacroDict) ->
+pre_proc([{'-', _}, {atom, _, include}, {'(', _}, {string, _, Filename}, {')', _}, {dot, _}], _MacroDict) ->


According to Elvis:

Line 204 is too long: pre_proc([{'-', _}, {atom, _, include}, {'(', _}, {string, _, Filename}, {')', _}, {dot, _}], _MacroDict) ->.

gadgetci · 2017-01-20T08:00:46Z

apps/ejabberd/src/dynamic_compile.erl

            %% Modify the FILE macro to reflect the filename
-            %%IncludeMacroDict = dict:store('FILE', {[],IncludeFilename}, MacroDict),
+            %%IncludeMacroDict = dict:store('FILE', {[], IncludeFilename}, MacroDict),
            IncludeMacroDict = MacroDict,

            %% Process the header file (inc. any nested header files)
            {RevIncludeForms, IncludedMacroDict} = scan_and_parse(IncludeFileRemainingTextents, IncludeFilename, 1, [], IncludeMacroDict, IncludeSearchPath),
            %io:format("include file results = ~p~n", [R]),
            %% Restore the FILE macro in the NEW MacroDict (so we keep any macros defined in the header file)


According to Elvis:

Line 134 is too long: %% Restore the FILE macro in the NEW MacroDict (so we keep any macros defined in the header file).

gadgetci · 2017-01-20T08:00:47Z

apps/ejabberd/src/ejabberd_admin.erl

@@ -402,11 +401,11 @@ restore_mnesia(Path) ->
            String = io_lib:format("Can't restore backup from ~p at node ~p: ~p",
                                   [filename:absname(Path), node(), Reason]),
            {cannot_restore, String};
-        {aborted,{no_exists,Table}} ->
+        {aborted, {no_exists, Table}} ->
            String = io_lib:format("Can't restore backup from ~p at node ~p: Table ~p does not exist.",


According to Elvis:

Line 405 is too long: String = io_lib:format("Can't restore backup from ~p at node ~p: Table ~p does not exist.",.

gadgetci · 2017-01-20T08:00:48Z

apps/ejabberd/src/dynamic_compile.erl

            %% Modify the FILE macro to reflect the filename
-            %%IncludeMacroDict = dict:store('FILE', {[],IncludeFilename}, MacroDict),
+            %%IncludeMacroDict = dict:store('FILE', {[], IncludeFilename}, MacroDict),
            IncludeMacroDict = MacroDict,

            %% Process the header file (inc. any nested header files)
            {RevIncludeForms, IncludedMacroDict} = scan_and_parse(IncludeFileRemainingTextents, IncludeFilename, 1, [], IncludeMacroDict, IncludeSearchPath),


According to Elvis:

Line 132 is too long: {RevIncludeForms, IncludedMacroDict} = scan_and_parse(IncludeFileRemainingTextents, IncludeFilename, 1, [], IncludeMacroDict, IncludeSearchPath),.

gadgetci · 2017-01-20T08:00:49Z

apps/ejabberd/src/ejabberd_admin.erl

@@ -567,7 +566,7 @@ mnesia_change_nodename(FromString, ToString, Source, Target) ->
        fun
            ({schema, db_nodes, Nodes}, Acc) ->
                io:format(" +++ db_nodes ~p~n", [Nodes]),
-                {[{schema, db_nodes, lists:map(Switch,Nodes)}], Acc};
+                {[{schema, db_nodes, lists:map(Switch, Nodes)}], Acc};
            ({schema, version, Version}, Acc) ->
                io:format(" +++ version: ~p~n", [Version]),


According to Elvis:

Remove the debug call to io:format/2 on line 571.

gadgetci · 2017-01-20T08:00:50Z

apps/ejabberd/src/dynamic_compile.erl

-    subst_macros_rev(Toks, MacroDict, [{integer,LineNum,LineNum}] ++ RevOutToks);
-subst_macros_rev([{'?',_}, {_,_,Name}, {'(',_} = Paren | Toks], MacroDict, RevOutToks) ->
+    subst_macros_rev(Toks, MacroDict, [{integer, LineNum, LineNum}] ++ RevOutToks);
+subst_macros_rev([{'?', _}, {_, _, Name}, {'(', _} = Paren | Toks], MacroDict, RevOutToks) ->
    case dict:fetch(Name, MacroDict) of
        {[], MacroValue} ->
            %% This macro does not have any vars, so ignore the fact that the invocation is followed by "(...stuff"


According to Elvis:

Line 245 is too long: %% This macro does not have any vars, so ignore the fact that the invocation is followed by "(...stuff".

gadgetci · 2017-01-20T08:00:51Z

apps/ejabberd/src/dynamic_compile.erl

@@ -175,7 +175,7 @@ scanner(Text, Line, MacroDict) ->
 is_only_comments(Text) -> is_only_comments(Text, not_in_comment).

 %% @private
-spec is_only_comments('eof' | string(),'in_comment' | 'not_in_comment') -> boolean().
+-spec is_only_comments('eof' | string(), 'in_comment' | 'not_in_comment') -> boolean().
 is_only_comments([],       _)              -> true;
 is_only_comments([$   |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment
 is_only_comments([$\t |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment


According to Elvis:

Line 181 is too long: is_only_comments([$\t |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment.

gadgetci · 2017-01-20T08:00:52Z

apps/ejabberd/src/dynamic_compile.erl

 %% @private
-spec pre_proc([{_,_} | {_,_,_}], macro_dict()) -> {'include',_} | {'macro', macro_dict()} | {'tokens',[any()]}.
-pre_proc([{'-',_},{atom,_,define},{'(',_},{_,_,Name}|DefToks],MacroDict) ->
+-spec pre_proc([{_, _} | {_, _, _}], macro_dict()) -> {'include', _} | {'macro', macro_dict()} | {'tokens', [any()]}.


According to Elvis:

Line 195 is too long: -spec pre_proc([{_, } | {, _, _}], macro_dict()) -> {'include', _} | {'macro', macro_dict()} | {'tokens', [any()]}..

gadgetci · 2017-01-20T08:00:52Z

apps/ejabberd/src/dynamic_compile.erl

@@ -120,19 +120,19 @@ scan_and_parse(RemainingText, CurrFilename, CurrLine, RevForms, MacroDict, Inclu
                {ok, Form} = erl_parse:parse_form(Toks),
                scan_and_parse(NRemainingText, CurrFilename, NLine, [Form | RevForms], MacroDict, IncludeSearchPath);
            {macro, NLine, NRemainingText, NMacroDict} ->
-                scan_and_parse(NRemainingText, CurrFilename, NLine, RevForms,NMacroDict, IncludeSearchPath);
+                scan_and_parse(NRemainingText, CurrFilename, NLine, RevForms, NMacroDict, IncludeSearchPath);


According to Elvis:

Line 123 is too long: scan_and_parse(NRemainingText, CurrFilename, NLine, RevForms, NMacroDict, IncludeSearchPath);.

gadgetci · 2017-01-20T08:00:53Z

apps/ejabberd/src/amp.erl

@@ -161,8 +161,8 @@ parse_rules(Stanza) ->

 -spec parse_rule(#xmlel{}) -> amp_rule() | amp_invalid_rule().


According to Elvis:

The spec in line 162 uses a record, please define a type for the record and use that instead.

gadgetci · 2017-01-20T08:00:54Z

apps/ejabberd/src/dynamic_compile.erl

@@ -175,7 +175,7 @@ scanner(Text, Line, MacroDict) ->
 is_only_comments(Text) -> is_only_comments(Text, not_in_comment).

 %% @private
-spec is_only_comments('eof' | string(),'in_comment' | 'not_in_comment') -> boolean().
+-spec is_only_comments('eof' | string(), 'in_comment' | 'not_in_comment') -> boolean().
 is_only_comments([],       _)              -> true;
 is_only_comments([$   |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment


According to Elvis:

Line 180 is too long: is_only_comments([$ |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment.

arcusfelis added 30 commits March 25, 2016 17:16

Start riak and mysql on new travis in Docker containers

3f2e0e8

Add advanced.confog into riak docker image

3f84a90

Use global connection to Cassandra

557aa4c

Update ejabberd.cfg with cassandra_servers

621ac85

Skip mam_SUITE for cassandra if there is no connection to Cassandra

b01f8e0

Add cassandra backend for mod_private

cb48fa4

Remove unused mod_mam_ca supervisors

f3d88b7

Rename cassandra_sup -> mongoose_cassandra_sup and worker

0446f41

Update Cassandra section in mod_mam documentation

954df07

Add mod_mam_ca_prefs

8f4e9fc

Move files ca => cassandra #712

3229751

Replace ca with cassandra #712

fc0ca8a

Enable mod_private with cassandra backend for cassandra_mnesia config…

0eb8ed3

…uration

Rename ca test group to cassandra

eb88e65

Enable all MAM tests

94b3b3b

Use correct prepared query name

09113fd

Add support for batch Cassandra queries

848a317

Add mongoose_cassandra:now_timestamp/0

3f0937d

Use batch queries for mod_private_cassandra

bbc4a52

Use batch queries for mod_mam_cassandra_prefs

58a5c06

Return {ok, Rows} from cql-queries

0fe3b4c

It was just Rows before

Add mod_privacy_cassandra

dbc648f

Add mod_roster_cassandra

9ef5c6f

Remove unused functions from mod_mam_muc_cassandra_arch

c5ea6e4

Use mongoose_cassandra behaviour for cassandra modules

9acb83d

Report preparing_query_failed error in cassandra worker

7206619

Update docs adding cassandra backend option [skip ci]

ba86a1b

Fix badmatch in handle_call of cassandra worker

3d4e6a8

Change primary key for privacy_item cassandra key-family

1ca32c8

Replace batches with just queries when they are impossible

7d4afed

michalwski and others added 6 commits January 19, 2017 16:48

Merge pull request #1147 from esl/muc-light-loop-fix

5b0c846

Muc light loop fix

Add Cassandra's schema converter draft

d6ac9eb

Reformat code with emacs

eae8c70

Add MUC schema converter implementation

921ae6e

Fix translate error in cassandra schema converter

acb383e

Merge pull request #1159 from esl/feature/cassandra-schema-converter

e8765d1

Feature/cassandra schema converter

gadgetci reviewed Jan 20, 2017

View reviewed changes

michalwski added 4 commits January 23, 2017 13:37

Remove HTTP File Ulpad from 2.1.x as it's in 2.0.1

62c4598

update exml and escalus deps

7ce4019

[skip ci] update CHANGELOG

7237e1b

bump VERSION to 2.0.1

084490b

michalwski force-pushed the rel-2.0.1 branch from 372a81e to 084490b Compare January 23, 2017 12:37

michalwski merged commit 084490b into rel-2.0 Jan 23, 2017

michalwski deleted the rel-2.0.1 branch January 23, 2017 15:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MongooseIM 2.0.1 #1160

MongooseIM 2.0.1 #1160

michalwski commented Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

gadgetci Jan 20, 2017

		@@ -120,19 +120,19 @@ scan_and_parse(RemainingText, CurrFilename, CurrLine, RevForms, MacroDict, Inclu
		{ok, Form} = erl_parse:parse_form(Toks),
		scan_and_parse(NRemainingText, CurrFilename, NLine, [Form \| RevForms], MacroDict, IncludeSearchPath);

		@@ -161,8 +161,8 @@ parse_rules(Stanza) ->

		-spec parse_rule(#xmlel{}) -> amp_rule() \| amp_invalid_rule().

MongooseIM 2.0.1 #1160

MongooseIM 2.0.1 #1160

Conversation

michalwski commented Jan 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment