Merge ee8b0b4 into aa4a134

lib/distributor.js

@@ -196,6 +196,12 @@ Distributor.prototype._runNext = function(callback) {
 			var stepCallback = this.slot();
 
 			var executor = node.runExecutor(executorId, executorParams, function(err) {
+				if (err && !err.projectStepError) {
+					logger.error(
+						'Error during project execution: ', err.stack || err
+					);
+				}
+
 				var changes = {
 					endDate: Date.now(),
 					completed: true

lib/executor/base.js

@@ -245,7 +245,16 @@ Executor.prototype.run = function(callback) {
 				};
 			});
 
-			funcs.push(this.slot());
+
+			var stepCallback = this.slot();
+			funcs.push(function(err) {
+				if (err) {
+					err.projectStepError = true;
+				}
+
+				stepCallback(err);
+			});
+
 			Steppy.apply(this, funcs);
 		},
 		function() {

test/executor.js

@@ -273,6 +273,82 @@ _(['local']).each(function(type) {
 			}
 		);
 
+
+		describe(
+			'with error produced by project step',
+			function() {
+				before(clearWorkspace);
+
+				it('instance should be created without errors', function() {
+					executor = createExecutor(makeExecutorParams({
+						project: {
+							steps: [
+								{type: 'shell', cmd: 'echo1'}
+							]
+						}
+					}));
+				});
+
+				var executorError;
+
+				it('should run with error', function(done) {
+					executor.run(function(err) {
+						expect(err).an(Error);
+						expect(err.message).match(/Error.*echo1/);
+						executorError = err;
+
+						done();
+					});
+				});
+
+				it(
+					'should produce error with `projectStepError`',
+					function() {
+						expect(executorError).have.key('projectStepError');
+						expect(executorError.projectStepError).equal(true);
+					}
+				);
+			}
+		);
+
+		describe(
+			'with error produced by scm (internal call)',
+			function() {
+				before(clearWorkspace);
+
+				it('instance should be created without errors', function() {
+					var executorParams = makeExecutorParams();
+					executorParams.project.scm = _({}).extend(
+						executorParams.project.scm,
+						{type: 'non-existing type'}
+					);
+
+					executor = createExecutor(executorParams);
+				});
+
+				var executorError;
+
+				it('should run with error', function(done) {
+					executor.run(function(err) {
+						expect(err).an(Error);
+						expect(err.message).eql(
+							'unknown scm type: non-existing type'
+						);
+						executorError = err;
+
+						done();
+					});
+				});
+
+				it(
+					'should produce error without `projectStepError`',
+					function() {
+						expect(executorError).not.have.key('projectStepError');
+					}
+				);
+			}
+		);
+
 	});
 
 });