Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/ui2

Browse source
This commit is contained in:
Martin Edenhofer 2013-09-19 16:57:40 +02:00
commit 0463f6941e
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/controllers/long_polling_controller.rb
View file

@ -8,17 +8,11 @@ class LongPollingController < ApplicationController
new_connection = false new_connection = false
# check client id # check client id
client_id = client_id_check client_id = client_id_verify
if !client_id if !client_id
new_connection = true new_connection = true
client_id = client_id_gen client_id = client_id_gen
log 'notice', "new client connection", client_id log 'notice', "new client connection", client_id
else
# cerify client id
if !client_id_verify
render :json => { :error => 'Invalid client_id in send!' }, :status => :unprocessable_entity
return
end
end end
if !params['data'] if !params['data']
params['data'] = {} params['data'] = {}
@ -109,13 +103,13 @@ class LongPollingController < ApplicationController
def message_receive def message_receive
# check client id # check client id
if !client_id_verify client_id = client_id_verify
if !client_id
render :json => { :error => 'Invalid client_id receive!' }, :status => :unprocessable_entity render :json => { :error => 'Invalid client_id receive!' }, :status => :unprocessable_entity
return return
end end
# check queue to send # check queue to send
client_id = client_id_check
begin begin
# update last ping # update last ping
@ -153,18 +147,16 @@ class LongPollingController < ApplicationController
end end
private private
def client_id_check
return params[:client_id].to_s if params[:client_id]
return
end
def client_id_gen def client_id_gen
rand(9999999999).to_s rand(9999999999).to_s
end end
def client_id_verify def client_id_verify
return if !params[:client_id] return if !params[:client_id]
sessions = Sessions.sessions sessions = Sessions.sessions
return if !sessions.include?( params[:client_id].to_s ) return if !sessions.include?( params[:client_id].to_s )
return true return params[:client_id].to_s
end end
def log( level, data, client_id = '-' ) def log( level, data, client_id = '-' )