change realtime port for the production server

app/initialize.js

@@ -11,9 +11,15 @@ $(function() {
 
   // start socket.io only when the user is logged in
   if(user.isLoggedIn()){
-    // hotfix for missing socket
-    window.socket = io.connect();
-    // connect the socket
+    // decide on location of the socket server
+    var socketServer = '';
+    if(window.realtimePort)
+      socketServer = location.host + ':' + window.realtimePort;
+    else
+      socketServer = '127.0.0.1:3000';
+
+    // connect to the socket
+    window.socket = io.connect(socketServer);
     socket.on('connect', function(){
       // register the socket to the server
       socket.emit('register_socket', user.id);

server.js

@@ -69,13 +69,14 @@ app.configure(function(){
 
 /** TODO: find out why res.redirect('/') is not working on uberhost */
 var baseURL = (process.env['NODE_ENV'] === 'production') ? 'http://speculos.taurus.uberspace.de' : '';
+var realtimePort = (process.env['NODE_ENV'] === 'production') ? 51584 : false;
 
 /** Performs general routing actions */
 var routeHandler = {
 
   /** Simply renders the index */
   renderIndex: function(req, res){
-    res.render('index', { user: (req.user || null), lockedModels: lockedModels });
+    res.render('index', { user: (req.user || null), lockedModels: lockedModels, realtimePort: realtimePort });
   },
 
   /** Redirects to the login when the user is not logged in */
@@ -84,7 +85,7 @@ var routeHandler = {
       var user = {};
       user._id = req.user.id;
       user._rev = req.user._rev;
-      res.render('index', { user: user, lockedModels: lockedModels });
+      res.render('index', { user: user, lockedModels: lockedModels, realtimePort: realtimePort });
     }else{
       res.redirect(baseURL + '/login?forward_to=' + req.url.split('/').join('__'));
     }
@@ -95,7 +96,7 @@ var routeHandler = {
     if(req.user){
       res.redirect(baseURL + '/edit');
     }else{
-      res.render('index', { user: null, lockedModels: lockedModels });
+      res.render('index', { user: null, lockedModels: lockedModels, realtimePort: realtimePort });
     }
   }
 };
@@ -244,7 +245,8 @@ console.log('Server is up and running on port: ' + port);
 var lockedModels = [];
 
 // Realtime stuff
-var io = io.listen(server);
+var io = (process.env.NODE_ENV == 'production') ? io.listen(51584) : io.listen(server);
+
 // a less noisy log level
 io.set('log level', 1)
 

server/views/index.jade

@@ -12,8 +12,11 @@ html
     script(src="/socket.io/socket.io.js")
     title CGIP
   body
-    script(id="lockedModels")
+    script(id="lm")
       window.lockedModels = !{JSON.stringify(lockedModels)};
+    scrip(id="rp")
+      window.realtimePort = !{realtimePort};
+
     if user
         script(id="user_hash")
           window.user_hash = !{JSON.stringify(user)};