diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2016-08-15 15:12:20 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-15 15:12:20 +0400 |
| commit | 38666cfd582e943d30692720486ba3073eb8b386 (patch) | |
| tree | fe266f472a5dec85f34e95203e256be92aef4025 | |
| parent | Don't delete ejabberd_commands table, it's problematic in cluster (#1210) (diff) | |
| parent | fix clean redis table (diff) | |
Merge pull request #1245 from hamano/clean_redis_table
fix clean redis table
| -rw-r--r-- | src/ejabberd_sm_redis.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ejabberd_sm_redis.erl b/src/ejabberd_sm_redis.erl index d25f777e3..2bfd2d8d1 100644 --- a/src/ejabberd_sm_redis.erl +++ b/src/ejabberd_sm_redis.erl @@ -145,7 +145,10 @@ clean_table() -> {_, SID} = binary_to_term(USSIDKey), node(element(2, SID)) == node() end, Vals), - Q1 = ["HDEL", ServKey | Vals1], + Q1 = case Vals1 of + [] -> []; + _ -> ["HDEL", ServKey | Vals1] + end, Q2 = lists:map( fun(USSIDKey) -> {US, SID} = binary_to_term(USSIDKey), @@ -153,7 +156,7 @@ clean_table() -> SIDKey = sid_to_key(SID), ["HDEL", USKey, SIDKey] end, Vals1), - Res = ejabberd_redis:qp([Q1|Q2]), + Res = ejabberd_redis:qp(lists:delete([], [Q1|Q2])), case lists:filter( fun({ok, _}) -> false; (_) -> true |