Fix for delete/cancel. Catch errors on migration.

Author: Sjoerd Tieleman

lib/job-handler.js

@@ -21,19 +21,24 @@ exports.freeSlots = function() {
 }
 
 exports.cancelAndRemove = function(internalId, callback) {
-  var job = Job.find(internalId, function(err, job) {
+  for (var item in slots) {
+    if (slots[item].internalId == internalId) {
+      slots[item].cancel();
+    }
+  }
+  
+  var job = Job.find({ where: { internalId: internalId }}).success(function(job) {
     if (job) {
-      job.cancel();
       job.destroy().success(function () {
         callback(null, job);
       }).error(function (error) {
         callback("Error while destroying job from database: " + error, null);
       });
-    } else if (err) {
-      callback("Error while cancelling and/or removing job: " + err, null);
     } else {
       callback("No such job to delete", null);      
     }
+  }).error(function(err) {
+    callback("Error while cancelling and/or removing job: " + err, null);
   });
 }
 

lib/job.js

@@ -40,13 +40,13 @@ var JobUtils = {
     return JobUtils.pad((process.umask() ^ 0777).toString(8), '0', 4);
   },
 
-  migrateDatabase: function() {
-    var migrator = JobUtils.getDatabase().getMigrator({path: __dirname + "/../migrations" }, true)
+  migrateDatabase: function(callback) {
+    var migrator = JobUtils.getDatabase().getMigrator({path: __dirname + "/../migrations" });
     migrator.migrate().success(function() {
-      // successfully migrated
+      callback(null);
     }).error(function(err) {
-      // can't migrate
-    })
+      callback(err);
+    });
   },
 
   pad: function(orig, padString, length) {
@@ -71,8 +71,10 @@ var Job = JobUtils.getDatabase().define('Job', {
   updatedAt:   Sequelize.DATE
 }, {
   classMethods: {
-    prepareDatabase: function() {
-      JobUtils.migrateDatabase();
+    prepareDatabase: function(callback) {
+      JobUtils.migrateDatabase(function (err) {
+        err ? callback(err) : callback(null);
+      });
     },
     create: function(opts, callback, completeCallback) {
       var job = Job.build({ opts: JSON.stringify(opts), internalId: Job.generateId() });

lib/server.js

@@ -98,11 +98,13 @@ removeJob = function(request, response) {
     var body = {};
 
     if (err) {
-      response.statusCode = 500;
-      body['message'] = unableToDeleteMessage;
-    } else if (!job) {
-      response.statusCode = 404;
-      body['message'] = notFoundMessage;            
+      if (job) {
+        response.statusCode = 500;
+        body['message'] = unableToDeleteMessage;
+      } else {
+        response.statusCode = 404;
+        body['message'] = notFoundMessage;            
+      }
     } else {
       response.statusCode = 200;
       body = job;

lib/transcoder.js

@@ -8,7 +8,13 @@ var Transcoder = function() {
 
 Transcoder.prototype.boot = function() {
   this.addSignalHandlers();
-  Job.prepareDatabase();
+  Job.prepareDatabase(function (err) {
+    if (err) {
+      // something went wrong
+      logger.log("Error while preparing database for the transcoder.");
+      process.exit(-1);
+    }
+  });
   server.launch();
 }