bring back git rev into appium output

carozuo · Feb 6, 2014 · ccfbd07 · ccfbd07
1 parent 2baf369
commit ccfbd07
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/server/helpers.js b/lib/server/helpers.js
@@ -124,8 +124,9 @@ module.exports.noColorLogger = function (tokens, req, res) {
     res.statusCode + ' ' + (new Date() - req._startTime) + 'ms' + len;
 };
 
-module.exports.configureServer = function (configFile, appiumRev, appiumVer,
-    appiumServer, cb) {
+module.exports.configureServer = function (configFile, appiumVer, appiumServer,
+    cb) {
+  var appiumRev;
   fs.readFile(configFile, function (err, data) {
     if (err) {
       logger.error("Could not find config file; looks like config hasn't " +
@@ -158,7 +159,7 @@ module.exports.configureServer = function (configFile, appiumRev, appiumVer,
       return cb(new Error("Appium / config version mismatch"));
     } else {
       appiumServer.registerConfig(rawConfig);
-      cb(null);
+      cb(null, appiumRev);
     }
   });
 };

diff --git a/lib/server/main.js b/lib/server/main.js
@@ -82,7 +82,11 @@ var main = function (args, readyCb, doneCb) {
 
   async.series([
     function (cb) {
-      configureServer(configFile, appiumRev, appiumVer, appiumServer, cb);
+      configureServer(configFile, appiumVer, appiumServer, function (err, rev) {
+        if (err) return cb(err);
+        appiumRev = rev;
+        cb();
+      });
     },
     function (cb) {
       conditionallyPreLaunch(args, appiumServer, cb);