fix for missing websocket

Author: jwcooper

controllers/editor.js

@@ -12,7 +12,7 @@ var fs_helper = require('../helpers/fs_helper'),
     db = require('../models/webideModel'),
     sanitize = require('validator');
 
-var REPOSITORY_PATH = path.resolve(__dirname, "../repositories")
+var REPOSITORY_PATH = path.resolve(__dirname, "../repositories");
 
 //Loads the editor
 exports.index = function(req, res) {
@@ -28,6 +28,7 @@ exports.index = function(req, res) {
 };
 
 exports.editor = function(ws, req) {
+  config.editor_ws = ws;
   winston.debug('socket io connection completed');
 
   function send_message(type, data) {

helpers/git_helper.js

@@ -39,13 +39,11 @@ function push_queue_interval() {
   function push(repository_path, remote, branch, username) {
     var repo = git(repository_path);
     repo.push(remote, branch, function(err) {
-      require('../server').get_socket(function(ws) {
-        if (err) {
-          winston.error(err);
-          ws_helper.send_message(ws, 'git-push-error', {err: "Error: Failure pushing code to remote repository"});
-        }
-        //winston.debug(obj);
-      });
+      if (err) {
+        winston.error(err);
+        ws_helper.send_message(null, 'git-push-error', {err: "Error: Failure pushing code to remote repository"});
+      }
+      //winston.debug(obj);
     });
   }
 

helpers/websocket_helper.js

@@ -1,3 +1,8 @@
+var config = require('../config/config');
+
 exports.send_message = function send_message(ws, type, data) {
+  if (!ws) {
+    ws = config.editor_ws;
+  }
   ws.send(JSON.stringify({type: type, data: data}));
 }