user_disconnect event trigger should be in begin

voltrb · Sep 18, 2015 · 861762e · 861762e
1 parent b33818d
commit 861762e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/lib/volt/server/socket_connection_handler.rb b/lib/volt/server/socket_connection_handler.rb
@@ -103,13 +103,14 @@ def closed
         # Remove ourself from the available channels
         @@channels.delete(self)
 
-        # Trigger a user disconnect event even if the user hasn't logged out
-        if @user_id
-          @@dispatcher.volt_app.trigger!("user_disconnect", @user_id)
-        end
-
         begin
           @@dispatcher.close_channel(self)
+
+          # Trigger a user disconnect event even if the user hasn't logged out
+          if @user_id
+            @@dispatcher.volt_app.trigger!("user_disconnect", @user_id)
+          end
+
         rescue DRb::DRbConnError => e
         # ignore drb read of @@dispatcher error if child has closed
         end