Merge pull request #72 from maraoz/bug/move-socket-file

move socket controller to controllers
This commit is contained in:
Mario Colque 2014-01-16 13:26:40 -08:00
commit 6bb19c9ba9
4 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
'use strict';
var Transaction = require('../../models/Transaction');
var Transaction = require('../models/Transaction');
// server-side socket behaviour

View File

@ -14,7 +14,7 @@ function spec() {
var Transaction = require('../app/models/Transaction');
var TransactionItem = require('../app/models/TransactionItem');
var Sync = require('./Sync').class();
var sockets = require('../app/views/sockets/main.js');
var sockets = require('../app/controllers/socket.js');
var CONCURRENCY = 5;

View File

@ -12,7 +12,7 @@ function spec() {
var Block = require('../app/models/Block');
var Transaction = require('../app/models/Transaction');
var TransactionItem = require('../app/models/TransactionItem');
var sockets = require('../app/views/sockets/main.js');
var sockets = require('../app/controllers/socket.js');
var CONCURRENCY = 5;

View File

@ -77,7 +77,7 @@ require('./config/routes')(app);
// socket.io
var server = require('http').createServer(app);
var io = require('socket.io').listen(server);
require('./app/views/sockets/main.js').init(app,io);
require('./app/controllers/socket.js').init(app,io);
//Start the app by listening on <port>
var port = process.env.PORT || config.port;