Merge branch 'master' into promisify-persistence-item

# Conflicts:
#	lib/server-code/api/persistence-item.js

Author: vengrov

lib/server-code/api/persistence-item.js

@@ -1,21 +1,7 @@
 'use strict';
 
-const Backendless = require('backendless');
-
-function promisify(fn, context) {
-  if (Backendless.promisesEnabled()) {
-    return fn.bind(context);
-  }
-  
-  return function() {
-    return new Promise((resolve, reject) => {
-      const args = Array.prototype.slice.call(arguments);
-      args.push(new Backendless.Async(resolve, reject));
-
-      fn.apply(context, args);
-    });
-  };
-}
+const Backendless = require('backendless'),
+      promisify   = require('../../util/promise').promisifyBackendless;
 
 class PersistenceItem {
   constructor() {

lib/server-code/runners/cloud.js

@@ -3,18 +3,19 @@
 const logger        = require('../../util/logger'),
       DriverService = require('../services/driver'),
       tasksExecutor = require('./tasks/executor'),
+      promisify     = require('../../util/promise').promisifyBackendless,
       Backendless   = require('backendless');
 
+function flushPendingLogs() {
+  return promisify(Backendless.Logging.flush, Backendless.Logging)();
+}
+
 function finalize() {
-  if (Backendless.Logging.messagesCount) {
-    return new Promise((resolve, reject) => {
-      return Backendless.Logging.flush(new Backendless.Async(resolve, reject));
-    });
-  }
+  return flushPendingLogs();
 }
 
 exports.start = function(opts) {
-  logger.info('Starting Cloud Code Runner');
+  logger.debug('Starting Cloud Code Runner');
 
   const driver = new DriverService(opts.driverHost, opts.driverPort, opts.driverRunnerId);
 
@@ -23,15 +24,17 @@ exports.start = function(opts) {
   }
 
   function processTask(task) {
-    logger.info(`[${task.id}] Processing started`);
+    logger.debug(`[${task.id}] Processing started`);
 
     return tasksExecutor.execute(task, opts)
       .then((result) => {
-        logger.info(`[${task.id}] Processing finished`);
+        logger.debug(`[${task.id}] Processing finished`);
 
         return result && driver.sendResult(task.id, result);
       });
   }
 
-  return getTask().then(processTask).then(finalize);
+  return getTask()
+    .then(processTask)
+    .then(finalize);
 };

lib/server-code/runners/debug.js

@@ -4,7 +4,7 @@ const logger           = require('../../util/logger'),
       file             = require('../../util/file'),
       redis            = require('redis'),
       promiseWhile     = require('../../util/promise').promiseWhile,
-      denodeify        = require('../../util/promise').denodeify,
+      denodeify        = require('../../util/promise').promisifyNode,
       ApiServerService = require('../services/api-server'),
       tasksExecutor    = require('./tasks/executor'),
       ServerCodeModel  = require('../model');

lib/server-code/runners/tasks/executor.js

@@ -96,7 +96,8 @@ executor.execute = function(task, runnerOpts, model) {
     .then((taskExecutor) => taskExecutor(task, runnerOpts, model))
     .then(result => result && invocationResult(null, result))
     .catch((err) => {
-      logger.error(err);
+      logger.error(`Error: ${err.message || err}`);
+
       return invocationResult(err);
     });
 };

lib/server-code/runners/tasks/invoke-handler.js

@@ -111,7 +111,7 @@ function buildModel(task, runnerOpts) {
   const modelDescriptorPath = `${codePath}/model.json`;
 
   if (!fs.existsSync(modelDescriptorPath)) {
-    logger.error(`Application Model descriptor not found (${modelDescriptorPath})`);
+    throw new Error(`Application Model descriptor not found [${modelDescriptorPath}]`);
   }
 
   const modelDescriptor = require(modelDescriptorPath);

lib/server-code/services/api-server.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const denodeify = require('../../util/promise').denodeify,
+const denodeify = require('../../util/promise').promisifyNode,
       logger    = require('../../util/logger'),
       request   = denodeify(require('request'));
 

lib/server-code/services/driver.js

@@ -73,12 +73,12 @@ class DriverService {
   }
 
   getRequest(requestId) {
-    logger.info('Getting task from CodeRunner Driver');
+    logger.debug('Getting task from CodeRunner Driver');
 
     return this.send('getRequest', 'GET', requestId)
       .then(res => {
         if (res.statusCode === 200) {
-          logger.info('Task successfully received');
+          logger.debug('Task successfully received');
           return res.body;
         }
 
@@ -87,12 +87,12 @@ class DriverService {
   }
 
   sendResult(requestId, result) {
-    logger.info('Sending Execution Result back to CodeRunner Driver');
+    logger.debug('Sending Execution Result back to CodeRunner Driver');
 
     return this.send('sendResult', 'POST', requestId, result)
       .then(res => {
         if (res.statusCode === 200) {
-          logger.info('Successfully sent');
+          logger.debug('Successfully sent');
         } else {
           throw new Error(parseError(res));
         }

lib/util/promise.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const Backendless = require('backendless');
+
 /**
  * Wraps a NodeJS continuation passing function and returns an equivalent version that returns a promise.
  * An analogue to the Q.denodeify
@@ -9,7 +11,7 @@
  *
  * @returns {function}
  */
-exports.denodeify = function(fn, context) {
+exports.promisifyNode = function(fn, context) {
   return function() {
     return new Promise((resolve, reject) => {
       const args = Array.prototype.slice.call(arguments);
@@ -20,6 +22,21 @@ exports.denodeify = function(fn, context) {
   };
 };
 
+exports.promisifyBackendless = function(fn, context) {
+  if (Backendless.promisesEnabled()) {
+    return fn.bind(context);
+  }
+  
+  return function() {
+    return new Promise((resolve, reject) => {
+      const args = Array.prototype.slice.call(arguments);
+      args.push(new Backendless.Async(resolve, reject));
+
+      fn.apply(context, args);
+    });
+  };
+};
+
 exports.promiseWhile = function(predicate, action) {
   function loop() {
     return predicate() && Promise.resolve(action()).then(loop);

package.json

@@ -33,7 +33,7 @@
     "backendless"
   ],
   "dependencies": {
-    "backendless": "^3.0.13",
+    "backendless": "^3.1.1",
     "commander": "^2.9.0",
     "glob": "^6.0.4",
     "jszip": "^2.5.0",