Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Disable awkward trap_exit flag

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2015-04-08 14:40:28 +03:00
parent bdedcf8d8a
commit 675c428f21
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ejabberd_odbc.erl
View File

@ -498,7 +498,6 @@ odbc_connect(SQLServer) ->
%% Open a database connection to SQLite %% Open a database connection to SQLite
sqlite_connect(DB) -> sqlite_connect(DB) ->
process_flag(trap_exit, true),
case sqlite3:open(?SQLITE_DB, [{file, binary_to_list(DB)}]) of case sqlite3:open(?SQLITE_DB, [{file, binary_to_list(DB)}]) of
{ok, Ref} -> {ok, Ref} ->
sqlite3:sql_exec(?SQLITE_DB, "pragma foreign_keys = on"), sqlite3:sql_exec(?SQLITE_DB, "pragma foreign_keys = on"),

1
src/ejabberd_odbc_sup.erl
View File

@ -135,7 +135,6 @@ transform_options(Opt, Opts) ->
[Opt|Opts]. [Opt|Opts].
check_sqlite_db(DB) -> check_sqlite_db(DB) ->
process_flag(trap_exit, true),
Ret = case sqlite3:open(?SQLITE_DB, [{file, binary_to_list(DB)}]) of Ret = case sqlite3:open(?SQLITE_DB, [{file, binary_to_list(DB)}]) of
{ok, _Ref} -> ok; {ok, _Ref} -> ok;
{error, {already_started, _Ref}} -> ok; {error, {already_started, _Ref}} -> ok;