From 1d36426108d2a9a5241cc04b0630356357a54edb Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 6 Aug 2012 08:29:39 +0200 Subject: [PATCH] Added debug feature and and disconnect of idle connections. --- script/websocket-server.rb | 87 +++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 19 deletions(-) diff --git a/script/websocket-server.rb b/script/websocket-server.rb index 89888639a..edf9170f7 100644 --- a/script/websocket-server.rb +++ b/script/websocket-server.rb @@ -8,10 +8,11 @@ require 'web_socket' require 'optparse' # Look for -o with argument, and -I and -D boolean arguments -options = { +@options = { :p => 6042, :b => '0.0.0.0', :s => false, + :d => false, :k => '/path/to/server.key', :c => '/path/to/server.crt', } @@ -19,14 +20,17 @@ tls_options = {} OptionParser.new do |opts| opts.banner = "Usage: websocket-server.rb [options]" + opts.on("-d", "--debug", "enable debug messages") do |d| + @options[:d] = d + end opts.on("-p", "--port [OPT]", "port of websocket server") do |p| - options[:p] = p + @options[:p] = p end opts.on("-b", "--bind [OPT]", "bind address") do |b| - options[:b] = b + @options[:b] = b end opts.on("-s", "--secure", "enable secure connections") do |s| - options[:s] = s + @options[:s] = s end opts.on("-k", "--private-key [OPT]", "/path/to/server.key for secure connections") do |k| tls_options[:private_key_file] = k @@ -36,29 +40,30 @@ OptionParser.new do |opts| end end.parse! -puts "Starting websocket server on #{ options[:b] }:#{ options[:p] } (secure:#{ options[:s].to_s })" +puts "Starting websocket server on #{ @options[:b] }:#{ @options[:p] } (secure:#{ @options[:s].to_s })" #puts options.inspect @clients = {} EventMachine.run { - EventMachine::WebSocket.start( :host => options[:b], :port => options[:p], :secure => options[:s], :tls_options => tls_options ) do |ws| + EventMachine::WebSocket.start( :host => @options[:b], :port => @options[:p], :secure => @options[:s], :tls_options => tls_options ) do |ws| # register client connection ws.onopen { client_id = ws.object_id - puts 'Client ' + client_id.to_s + ' connected' + log 'notice', 'Client connected.', client_id if !@clients.include? client_id @clients[client_id] = { :websocket => ws, - } + :last_ping => Time.new + } end } # unregister client connection ws.onclose { client_id = ws.object_id - puts 'Client ' + client_id.to_s + ' disconnected' + log 'notice', 'Client disconnected.', client_id # removed from current client list if @clients.include? client_id @@ -72,41 +77,85 @@ EventMachine.run { ws.onmessage { |msg| client_id = ws.object_id - puts 'From Client ' + client_id.to_s + ' received message: ' + msg - data = JSON.parse(msg) + log 'debug', "received message: #{ msg } ", client_id + begin + data = JSON.parse(msg) + rescue => e + log 'error', "can't parse message: #{ msg }, #{ e.inspect}", client_id + next + end # get session if data['action'] == 'login' @clients[client_id][:session] = data['session'] Session.create( client_id, data['session'] ) - # ping + # remember ping, send pong back elsif data['action'] == 'ping' @clients[client_id][:last_ping] = Time.now - ws.send( '[{"action":"pong"}]' ) + @clients[client_id][:websocket].send( '[{"action":"pong"}]' ) end } end - EventMachine.add_periodic_timer(0.2) { - puts "loop" + # check open unused connections, kick all connection without activitie in the last 5 minutes + EventMachine.add_periodic_timer(120) { + log 'notice', "check unused idle connections..." @clients.each { |client_id, client| - log 'checking waiting data...', client_id + if ( @clients[client_id][:last_ping] + ( 60 * 4 ) ) < Time.now + log 'notice', "closing idle connection", client_id + + # remember to not use this connection anymore + @clients[client_id][:disconnect] = true + + # try to close regular + @clients[client_id][:websocket].close_websocket + + # delete sesstion from client list + sleep 1 + @clients.delete(client_id) + end + } + } + + EventMachine.add_periodic_timer(20) { + log 'notice', "Status: clients: #{ @clients.size }" + @clients.each { |client_id, client| + log 'notice', 'working...', client_id + } + } + + EventMachine.add_periodic_timer(0.2) { + next if @clients.size == 0 + log 'debug', "checking for data..." + @clients.each { |client_id, client| + next if @clients[client_id][:disconnect] + log 'debug', 'checking for data...', client_id begin queue = Session.queue( client_id ) if queue && queue[0] # log "send " + queue.inspect, client_id - log "send data to client", client_id + log 'debug', "send data to client", client_id client[:websocket].send( queue.to_json ) end rescue => e - log 'problem:' + e.inspect, client_id + + log 'error', 'problem:' + e.inspect, client_id + + # disconnect client + if @clients.include? client_id + @clients.delete client_id + end end } } - def log( data, client_id ) + def log( level, data, client_id = '-' ) + if !@options[:d] + return if level == 'debug' + end puts "#{Time.now}:client(#{ client_id }) #{ data }" +# puts "#{Time.now}:#{ level }:client(#{ client_id }) #{ data }" end }