]> granicus.if.org Git - ejabberd/commitdiff
Ignore errors when retrieving status if the users just got offline
authorMickaël Rémond <mremond@process-one.net>
Fri, 20 Mar 2015 10:42:32 +0000 (11:42 +0100)
committerBadlop <badlop@process-one.net>
Thu, 26 Mar 2015 13:00:50 +0000 (14:00 +0100)
Fix possible race condition.

src/mod_admin_extra.erl

index 7729d89fd208c086bf2ee35bc5f1db9d2f70e6dd..ee5880d9dcb4b2ef27cc5269e419a0d7902321aa 100644 (file)
@@ -836,7 +836,7 @@ get_status_list(Host, Status_required) ->
            end,
     Sessions3 = [ {Pid, Server, Priority} || {{_User, Server, _Resource}, {_, Pid}, Priority} <- Sessions2, apply(Fhost, [Server, Host])],
     %% For each Pid, get its presence
-    Sessions4 = [ {ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
+    Sessions4 = [ {catch ejabberd_c2s:get_presence(Pid), Server, Priority} || {Pid, Server, Priority} <- Sessions3],
     %% Filter by status
     Fstatus = case Status_required of
                  <<"all">> ->