Merge branch 'develop' into feature_coalescing-support

.dockerignore

@@ -0,0 +1,9 @@
+.git*
+*.md
+.jsh*
+.travis*
+.totem*
+totem*
+AUTHORS
+LICENSE
+*.apib

.travis.yml

@@ -1,5 +1,7 @@
 language: node_js
 node_js:
   - '0.10'
+before_install:
+  npm install -g npm
 sudo: false
 script: './node_modules/.bin/grunt travis'

Dockerfile

@@ -1,4 +1,4 @@
-FROM totem/nodejs-base:0.10.38-trusty-b2
+FROM totem/nodejs-base:0.10.42
 
 ENV DEBIAN_FRONTEND noninteractive
 

Gruntfile.js

@@ -46,8 +46,8 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-mocha-cov');
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
-  grunt.registerTask('test', ['jshint', 'mochacov:unit', 'mochacov:coverage']);
-  grunt.registerTask('travis', ['jshint', 'mochacov:unit', 'mochacov:coverage', 'mochacov:coveralls']);
+  grunt.registerTask('test', ['jshint', 'mochacov:unit']);
+  grunt.registerTask('travis', ['jshint', 'mochacov:unit', 'mochacov:coveralls']);
   grunt.registerTask('default', 'test');
 
 };

config/config-docker.json

@@ -24,6 +24,7 @@
       "retryWait": 20000
     }
   },
+  "concurrentJobs" : 2,
   "colaescingPeriod": 30000,
   "swf":{
     "region": "us-west-1",

config/config-test.json

@@ -18,6 +18,7 @@
       "timeout": "1800000"
     }
   },
+  "concurrentJobs" : 2,
   "colaescingPeriod": 30000,
   "swf":{
     "region": "us-west-1",

config/config.json

@@ -24,6 +24,7 @@
       "retryWait": 20000
     }
   },
+  "concurrentJobs" : 2,
   "colaescingPeriod": 30000,
   "swf":{
     "region": "us-west-1",

lib/factory.js

@@ -64,6 +64,7 @@ var DEFAULT_CONFIG = {
       timeout: 1800000 // 30 minutes
     }
   },
+  concurrentJobs: 1,
   coalescingPeriod: 30000,
   hook: {
     secret: process.env.HOOK_SECRET || 'changeit',
@@ -87,6 +88,9 @@ function Factory(config) {
 
   // Merge in custom config with defaults
   _.defaults(config, DEFAULT_CONFIG);
+
+  // Store reference to current object
+  var _this = this;
 
   // Save our config
   this.config = config;
@@ -97,6 +101,29 @@ function Factory(config) {
   // Datastore for jobs
   this.jobs = new Datastore();
 
+  // Initializes an empty job queue
+  this.jobQueue = async.queue(function(job, callback) {
+
+    // Start building an image when a job is taken from the queue
+    job.start(function (err) {
+      callback(err); // Job is considered finished
+
+      var isSuccessful = (err ? false : true);
+      var image = _this.getImage(job);
+
+      //Notify build was successful / failed.
+      var notifyCtx = _.extend({}, job.context, {
+        baseUrl: _this.config.baseUrl,
+        env: _this.config.env,
+        id: job.id
+      });
+      _.forEach(_this.notifiers, function(notifier) {
+        notifier.notify(isSuccessful, notifyCtx, image);
+      });
+
+    });
+  }, this.config.concurrentJobs); // Limit the number of concurrent jobs
+
   // Notification for job
   this.notifiers = [
     new PostHookNotifier(config.hook),
@@ -105,7 +132,6 @@ function Factory(config) {
 
   // Initialize the API
   this.initApi();
-
 }
 
 // Ensure we can emit events
@@ -334,19 +360,13 @@ Factory.prototype.newJob = function newJob(context) {
   // Store the Job in the datastore
   _this.jobs.put(job.id, job);
 
-  // Start building the image
-  job.start(function (err) {
-    var isSuccessful = (err ? false : true);
-    var image = _this.getImage(job);
-    //Notify build was successful / failed.
-    var notifyCtx = _.extend({}, context, {
-      baseUrl: _this.config.baseUrl,
-      env: _this.config.env,
-      id: job.id
-    });
-    _.forEach(_this.notifiers, function(notifier) {
-      notifier.notify(isSuccessful, notifyCtx, image);
-    });
+  // Add the Job to the job queue
+  _this.jobQueue.push(job, function(err) {
+      if(err) {
+        winston.log('debug', 'Finished job ' + job.id + ' with errors.\n' + err.message);
+      } else {
+        winston.log('debug', 'Finished job ' + job.id);
+      }
   });
 
   return job;

lib/job.js

@@ -18,7 +18,8 @@ var os = require('os'),
     _ = require('lodash'),
     formatter = require('formatter'),
     constants = require('./constants'),
-    helpers = require('./util');
+    helpers = require('./util'),
+    winston = require('winston');
 
 
 // Export the JobRunner class
@@ -135,6 +136,7 @@ Job.prototype.start = function start(cb) {
 
   _this.emit(this.status);
 
+  winston.log('debug', 'Started building job ' + _this.id);
   // Start building the image
   this._executeJob(function (err) {