beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

got clustering to work with socket.io

Browse source 
deleted:    dump.rdb

	modified:   config/socket.io.js
	new file:   dump.rdb
	modified:   package.json
	modified:   public/dist/application.js
	modified:   public/dist/application.min.js
	modified:   public/modules/core/services/socket.io.client.service.js
	modified:   public/modules/forms/directives/analytics-service.client.directive.js
	deleted:    dump.rdb
This commit is contained in:
David Baldwynn 2016-06-06 19:53:47 -07:00
parent dfb51d8117
commit a6f8b283e0
6 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/socket.io.js
View file

@ -11,8 +11,9 @@ var config = require('./config'),
module.exports = function (app, db) {
var server = http.createServer(app);
// Create a new Socket.io server
var io = socketio.listen(server);
var io = socketio(config.socketPort, { transports: ['websocket', 'polling'] });
var redis = require('socket.io-redis');
io.adapter(redis({ host: '127.0.0.1', port: 6379 }));
// Add an event listener to the 'connection' event
io.on('connection', function (socket) {

1
package.json
View file

@ -84,6 +84,7 @@
"raven": "^0.9.0",
"soap": "^0.11.0",
"socket.io": "^1.4.6",
"socket.io-redis": "^1.0.0",
"swig": "~1.4.1"
},
"devDependencies": {

8
public/dist/application.js vendored
View file

@ -727,14 +727,13 @@ angular.module('core').service('Menus', [
socket: null
};
console.log('https://'+window.location.hostname+':'+$window.socketPort);
connect('https://'+window.location.hostname+':'+$window.socketPort);
connect(window.location.protocol+'//'+window.location.hostname+':'+$window.socketPort);
return service;
// Connect to Socket.io server
function connect(url) {
service.socket = io();
service.socket = io({'transports': ['websocket', 'polling']});
}
// Wrap the Socket.io 'emit' method
@ -1115,7 +1114,6 @@ angular.module('forms').controller('SubmitFormController', ['$scope', '$rootScop
// Create a controller method for sending visitor data
function send(form, lastActiveIndex, timeElapsed) {
console.log(lastActiveIndex);
// Create a new message object
var visitorData = {
referrer: document.referrer,
@ -1137,7 +1135,7 @@ angular.module('forms').controller('SubmitFormController', ['$scope', '$rootScop
var service = {
send: send
};
init();
return service;

4
public/dist/application.min.js vendored
View file

File diff suppressed because one or more lines are too long

5
public/modules/core/services/socket.io.client.service.js
View file

@ -17,14 +17,13 @@
socket: null
};
console.log('https://'+window.location.hostname+':'+$window.socketPort);
connect('https://'+window.location.hostname+':'+$window.socketPort);
connect(window.location.protocol+'//'+window.location.hostname+':'+$window.socketPort);
return service;
// Connect to Socket.io server
function connect(url) {
service.socket = io();
service.socket = io(url, {'transports': ['websocket', 'polling']});
}
// Wrap the Socket.io 'emit' method

3
public/modules/forms/directives/analytics-service.client.directive.js
View file

@ -13,7 +13,6 @@
// Create a controller method for sending visitor data
function send(form, lastActiveIndex, timeElapsed) {
console.log(lastActiveIndex);
// Create a new message object
var visitorData = {
referrer: document.referrer,
@ -35,7 +34,7 @@
var service = {
send: send
};
init();
return service;