Skip to content
This repository was archived by the owner on Oct 10, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ command help
-o, --output <output> Output file
-t, --type <type> Type of websocket server to bench(socket.io, engine.io, faye, primus, wamp). Default to socket.io
-p, --transport <type> Type of transport to websocket(engine.io, websockets, browserchannel, sockjs, socket.io). Default to websockets (Just for Primus)
-n, --pathname <type> Pathname for primus configuration, default is '/primus'
-k, --keep-alive Keep alive connection
-v, --verbose Verbose Logging

Expand Down
4 changes: 3 additions & 1 deletion index.js
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ program
.option('-o, --output <output>', 'Output file')
.option('-t, --type <type>', 'type of websocket server to bench(socket.io, engine.io, faye, primus, wamp). Default to io')
.option('-p, --transport <type>', 'type of transport to websocket(engine.io, websockets, browserchannel, sockjs, socket.io). Default to websockets')
.option('-n, --pathname <type>', 'pathname for primus configuration, default is "/primus" ')
.option('-k, --keep-alive', 'Keep alive connection')
.option('-v, --verbose', 'Verbose Logging')
.parse(process.argv);
Expand Down Expand Up @@ -74,7 +75,8 @@ var options = {
type : program.type,
transport : program.transport,
keepAlive : program.keepAlive,
verbose : program.verbose
verbose : program.verbose,
pathname : program.pathname
};

if (program.verbose) {
Expand Down
3 changes: 2 additions & 1 deletion lib/benchmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ Benchmark.prototype.launch = function (connectNumber, concurency, workerNumber,
for (var i = 0; i < workerNumber; i++) {

this.workers[i] = cp.fork(__dirname + '/worker.js', [
this.server, this.options.generatorFile, this.options.type, this.options.transport, this.options.verbose
this.server, this.options.generatorFile, this.options.type, this.options.transport, this.options.verbose,
this.options.pathname
]);

this.workers[i].on('message', this._onMessage.bind(this));
Expand Down
2 changes: 1 addition & 1 deletion lib/workers/primusworker.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var BaseWorker = require('./baseworker.js'),
logger = require('../logger.js');

// Create a primus instance in order to obtain the client constructor.
var PrimusClient = new Primus(http.createServer(), {'transformer' : process.argv[5]}).Socket;
var PrimusClient = new Primus(http.createServer(), {'transformer' : process.argv[5] , pathname: process.argv[7]}).Socket;

var PrimusWorker = function (server, generator) {
PrimusWorker.super_.apply(this, arguments);
Expand Down
4 changes: 2 additions & 2 deletions test/functional/faye.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe('Test Faye Benchmarking', function () {
});

it('should connect call reporter with 5 connection done', function (done) {
var stubReport = sinon.stub(testReporter, 'report', function (steps, monitor) {
var stubReport = sinon.stub(testReporter, 'report').callsFake(function (steps, monitor) {
assert.equal(monitor.results.connection, 5);
assert.equal(monitor.results.errors, 0);
testReporter.report.restore();
Expand All @@ -62,7 +62,7 @@ describe('Test Faye Benchmarking', function () {
});
describe('Test without faye server', function () {
it('should connect call reporter with 10 errors', function (done) {
var stubReport = sinon.stub(testReporter, 'report', function (steps, monitor) {
var stubReport = sinon.stub(testReporter, 'report').callsFake(function (steps, monitor) {
assert.equal(monitor.results.connection, 0);
assert.equal(monitor.results.errors, 10);
testReporter.report.restore();
Expand Down