diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ejabberd_stacktrace.hrl (renamed from include/mod_carboncopy.hrl) | 14 | ||||
| -rw-r--r-- | include/mod_muc_room.hrl | 14 | ||||
| -rw-r--r-- | include/pubsub.hrl | 2 |
3 files changed, 14 insertions, 16 deletions
diff --git a/include/mod_carboncopy.hrl b/include/ejabberd_stacktrace.hrl index f02f3e8f3..470abed15 100644 --- a/include/mod_carboncopy.hrl +++ b/include/ejabberd_stacktrace.hrl @@ -18,10 +18,10 @@ %%% %%%---------------------------------------------------------------------- --type matchspec_atom() :: '_' | '$1' | '$2' | '$3' | '$4'. --record(carboncopy, {us :: {binary(), binary()} | matchspec_atom(), - resource :: binary() | matchspec_atom(), - version :: binary() | matchspec_atom(), - node = node() :: node() | matchspec_atom()}). - --define(CARBONCOPY_CACHE, carboncopy_cache). +-ifdef(DEPRECATED_GET_STACKTRACE). +-define(EX_RULE(Class, Reason, Stack), Class:Reason:Stack). +-define(EX_STACK(Stack), Stack). +-else. +-define(EX_RULE(Class, Reason, _), Class:Reason). +-define(EX_STACK(_), erlang:get_stacktrace()). +-endif. diff --git a/include/mod_muc_room.hrl b/include/mod_muc_room.hrl index 35bdb6ff7..65f3c5479 100644 --- a/include/mod_muc_room.hrl +++ b/include/mod_muc_room.hrl @@ -22,8 +22,6 @@ -define(SETS, gb_sets). --define(DICT, dict). - -record(lqueue, { queue :: p1_queue:queue(), @@ -105,13 +103,13 @@ access = {none,none,none,none} :: {atom(), atom(), atom(), atom()}, jid = #jid{} :: jid(), config = #config{} :: config(), - users = (?DICT):new() :: dict:dict(), - subscribers = (?DICT):new() :: dict:dict(), - subscriber_nicks = (?DICT):new() :: dict:dict(), + users = #{} :: map(), + subscribers = #{} :: map(), + subscriber_nicks = #{} :: map(), last_voice_request_time = treap:empty() :: treap:treap(), - robots = (?DICT):new() :: dict:dict(), - nicks = (?DICT):new() :: dict:dict(), - affiliations = (?DICT):new() :: dict:dict(), + robots = #{} :: map(), + nicks = #{} :: map(), + affiliations = #{} :: map(), history :: lqueue(), subject = [] :: [text()], subject_author = <<"">> :: binary(), diff --git a/include/pubsub.hrl b/include/pubsub.hrl index 923f5f5a9..7a72c6955 100644 --- a/include/pubsub.hrl +++ b/include/pubsub.hrl @@ -27,7 +27,7 @@ %% this is currently a hard limit. %% Would be nice to have it configurable. --define(MAX_PAYLOAD_SIZE, 60000). +-define(MAX_PAYLOAD_SIZE, 250000). %% ------------------------------- %% Pubsub types |