From 9cdd2a94ea4cb8aaf2afaf4dbcbde7a683a9b517 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 11 Jun 2013 08:17:50 +0200
Subject: [PATCH] Added ajax session last ping to not expire valid sessions.

---
 app/controllers/long_polling_controller.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/long_polling_controller.rb b/app/controllers/long_polling_controller.rb
index 6e91827f7..b5d6061a1 100644
--- a/app/controllers/long_polling_controller.rb
+++ b/app/controllers/long_polling_controller.rb
@@ -70,15 +70,17 @@ class LongPollingController < ApplicationController
           if params['data']['data']['recipient'] && params['data']['data']['recipient']['user_id']
             params['data']['data']['recipient']['user_id'].each { |user_id|
               if local_client[:user][:id] == user_id
-                log 'notice', "send broadcast (user_id #{user_id})", local_client_id
+                log 'notice', "send broadcast from (#{client_id.to_s}) to (user_id #{user_id})", local_client_id
                 Session.send( local_client_id, params['data'] )
               end
             }
           # broadcast every client
           else
-            log 'notice', "send broadcast", local_client_id
+            log 'notice', "send broadcast from (#{client_id.to_s})", local_client_id
             Session.send( local_client_id, params['data'] )
           end
+        else
+          log 'notice', "do not send broadcast to it self", client_id
         end
       }
     end
@@ -100,10 +102,13 @@ class LongPollingController < ApplicationController
       return
     end
 
-    # check queue queue to send
+    # check queue to send
     client_id = client_id_check
     begin
 
+      # update last ping
+      Session.touch( client_id )
+
       # set max loop time to 28 sec. because of 30 sec. timeout of mod_proxy
       count = 14
       while true
@@ -140,8 +145,6 @@ class LongPollingController < ApplicationController
       return if !params[:client_id]
       sessions = Session.sessions
       return if !sessions.include?( params[:client_id].to_s )
-#    Session.update( client_id )
-#      Session.touch( params[:client_id] )
       return true
     end