diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
| commit | fd8e07af4789be362a61755ea47f216baeb64989 (patch) | |
| tree | 0ac0a7a779fd27e79e940519441161dc0c4dfd5f /src/mod_proxy65_sql.erl | |
| parent | Log modules startup (diff) | |
Get rid of ejabberd.hrl header
The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.
TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5
Diffstat (limited to 'src/mod_proxy65_sql.erl')
| -rw-r--r-- | src/mod_proxy65_sql.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mod_proxy65_sql.erl b/src/mod_proxy65_sql.erl index d943a2d29..0f51adb55 100644 --- a/src/mod_proxy65_sql.erl +++ b/src/mod_proxy65_sql.erl @@ -28,7 +28,6 @@ %% API -export([init/0, register_stream/2, unregister_stream/1, activate_stream/4]). --include("ejabberd.hrl"). -include("logger.hrl"). -include("ejabberd_sql_pt.hrl"). @@ -39,7 +38,7 @@ init() -> NodeS = erlang:atom_to_binary(node(), latin1), ?DEBUG("Cleaning SQL 'proxy65' table...", []), case ejabberd_sql:sql_query( - ?MYNAME, + ejabberd_config:get_myname(), ?SQL("delete from proxy65 where " "node_i=%(NodeS)s or node_t=%(NodeS)s")) of {updated, _} -> @@ -65,7 +64,7 @@ register_stream(SID, Pid) -> "values (%(SID)s, %(PidS)s, %(NodeS)s, '', '', '')")) end end, - case ejabberd_sql:sql_transaction(?MYNAME, F) of + case ejabberd_sql:sql_transaction(ejabberd_config:get_myname(), F) of {atomic, _} -> ok; {aborted, Reason} -> @@ -77,7 +76,7 @@ unregister_stream(SID) -> ejabberd_sql:sql_query_t( ?SQL("delete from proxy65 where sid=%(SID)s")) end, - case ejabberd_sql:sql_transaction(?MYNAME, F) of + case ejabberd_sql:sql_transaction(ejabberd_config:get_myname(), F) of {atomic, _} -> ok; {aborted, Reason} -> @@ -125,7 +124,7 @@ activate_stream(SID, IJID, MaxConnections, _Node) -> ejabberd_sql:abort(Err) end end, - case ejabberd_sql:sql_transaction(?MYNAME, F) of + case ejabberd_sql:sql_transaction(ejabberd_config:get_myname(), F) of {atomic, Result} -> Result; {aborted, {limit, _, _} = Limit} -> |