From 929c33ffe5c0aa056a710ed03f7771afb379a55b Mon Sep 17 00:00:00 2001 From: James Coglan Date: Sat, 3 Apr 2010 16:55:59 +0100 Subject: [PATCH] A few hacks to enable testing using CometD stress testing tools. --- build/faye.js | 2 +- examples/node/app.js | 2 +- examples/rack/config.ru | 2 +- javascript/server.js | 2 +- lib/faye/server.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/faye.js b/build/faye.js index 15510fec..2f11fab7 100644 --- a/build/faye.js +++ b/build/faye.js @@ -1025,7 +1025,7 @@ Faye.Server = Faye.Class({ if (!message.version) response.error = Faye.Error.parameterMissing('version'); - var clientConns = message.supportedConnectionTypes, + var clientConns = message.supportedConnectionTypes || ['long-polling'], commonConns; if (!local) { diff --git a/examples/node/app.js b/examples/node/app.js index da23c4ac..a06fcf1f 100644 --- a/examples/node/app.js +++ b/examples/node/app.js @@ -5,7 +5,7 @@ var fs = require('fs'), faye = require('./faye'); var PUBLIC_DIR = path.dirname(__filename) + '/../shared/public', - comet = new faye.NodeAdapter({mount: '/comet', timeout: 45}), + comet = new faye.NodeAdapter({mount: '/cometd', timeout: 5}), port = process.ARGV[2] || '8000'; diff --git a/examples/rack/config.ru b/examples/rack/config.ru index 0889a753..f049bddc 100644 --- a/examples/rack/config.ru +++ b/examples/rack/config.ru @@ -3,6 +3,6 @@ dir = File.dirname(__FILE__) require dir + '/../../lib/faye' require dir + '/app' -use Faye::RackAdapter, :mount => '/comet', :timeout => 25 +use Faye::RackAdapter, :mount => '/cometd', :timeout => 5 run Sinatra::Application diff --git a/javascript/server.js b/javascript/server.js index 16e693f3..3431204f 100644 --- a/javascript/server.js +++ b/javascript/server.js @@ -112,7 +112,7 @@ Faye.Server = Faye.Class({ if (!message.version) response.error = Faye.Error.parameterMissing('version'); - var clientConns = message.supportedConnectionTypes, + var clientConns = message.supportedConnectionTypes || ['long-polling'], commonConns; if (!local) { diff --git a/lib/faye/server.rb b/lib/faye/server.rb index 9e1416cd..745858cc 100644 --- a/lib/faye/server.rb +++ b/lib/faye/server.rb @@ -104,7 +104,7 @@ def handshake(message, local = false) unless local response['supportedConnectionTypes'] = CONNECTION_TYPES - client_conns = message['supportedConnectionTypes'] + client_conns = message['supportedConnectionTypes'] || ['long-polling'] if client_conns common_conns = client_conns.select { |c| CONNECTION_TYPES.include?(c) } response['error'] = Error.conntype_mismatch(*client_conns) if common_conns.empty?