diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-05-17 19:29:19 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-05-17 19:29:19 +0300 |
| commit | 6691c59a7ab2993f186f9b3309f440cd60ae3bcb (patch) | |
| tree | 56cfb471966a3c02b63fe590898ef729b2c7a960 /src | |
| parent | Use disc_only_copies for oauth_token Mnesia table (diff) | |
Clean up database code related to mod_vcard_xupdate
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_config.erl | 2 | ||||
| -rw-r--r-- | src/ejd2sql.erl | 3 | ||||
| -rw-r--r-- | src/mod_vcard_xupdate.erl | 10 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 1dc30b1c5..1e5d495ce 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -1092,7 +1092,7 @@ replace_module(mod_roster_odbc) -> {mod_roster, sql}; replace_module(mod_shared_roster_odbc) -> {mod_shared_roster, sql}; replace_module(mod_vcard_odbc) -> {mod_vcard, sql}; replace_module(mod_vcard_ldap) -> {mod_vcard, ldap}; -replace_module(mod_vcard_xupdate_odbc) -> {mod_vcard_xupdate, sql}; +replace_module(mod_vcard_xupdate_odbc) -> mod_vcard_xupdate; replace_module(mod_pubsub_odbc) -> {mod_pubsub, sql}; replace_module(mod_http_bind) -> mod_bosh; replace_module(Module) -> diff --git a/src/ejd2sql.erl b/src/ejd2sql.erl index 343c3518a..c4f00a551 100644 --- a/src/ejd2sql.erl +++ b/src/ejd2sql.erl @@ -60,8 +60,7 @@ modules() -> mod_private, mod_roster, mod_shared_roster, - mod_vcard, - mod_vcard_xupdate]. + mod_vcard]. export(Server, Output) -> LServer = jid:nameprep(iolist_to_binary(Server)), diff --git a/src/mod_vcard_xupdate.erl b/src/mod_vcard_xupdate.erl index 0da8198d9..74f6b7364 100644 --- a/src/mod_vcard_xupdate.erl +++ b/src/mod_vcard_xupdate.erl @@ -162,6 +162,14 @@ compute_hash(VCard) -> %%==================================================================== %% Options %%==================================================================== +mod_opt_type(db_type) -> + fun(_) -> + ?WARNING_MSG("option 'db_type' for module '~s' has no effect: " + "the module doesn't require database anymore; " + "feel free to delete any tables related to the module", + [?MODULE]), + erlang:error(badarg) + end; mod_opt_type(O) when O == cache_life_time; O == cache_size -> fun (I) when is_integer(I), I > 0 -> I; (infinity) -> infinity @@ -169,4 +177,4 @@ mod_opt_type(O) when O == cache_life_time; O == cache_size -> mod_opt_type(O) when O == use_cache; O == cache_missed -> fun (B) when is_boolean(B) -> B end; mod_opt_type(_) -> - [cache_life_time, cache_size, use_cache, cache_missed]. + [db_type, cache_life_time, cache_size, use_cache, cache_missed]. |