Merge pull request #5132 from realm/merge-c02607-to-master-4.0

Fix merge from c02607 to master-4.0

Author: cmelchior

tools/sync_test_server/ros-testing-server.js

@@ -7,6 +7,26 @@ const exec = require('child_process').exec;
 var http = require('http');
 var dispatcher = require('httpdispatcher');
 
+// this query is used to check if ROS has started
+// while waiting for a permanante fix in https://github.com/realm/realm-object-server/issues/1297.
+// query should return 200 with the JSON payload Ex: {"version":"1.8.1","flavor":"developer","setupRequired":true}
+var options = {
+  hostname: '127.0.0.1',
+  port: 9080,
+  path: '/api/info',
+  method: 'GET'
+};
+
+function tryUntilROSStart(options, callback) {
+    var req = http.request(options, function(res) {
+        callback(null, res);
+    });
+    req.on('error', function(e) {
+        tryUntilROSStart(options, callback);
+    });
+    req.end();
+}
+
 // Automatically track and cleanup files at exit
 temp.track();
 
@@ -34,12 +54,6 @@ function handleRequest(request, response) {
 var syncServerChildProcess = null;
 
 function startRealmObjectServer(done) {
-    // Hack for checking the ROS is fully initialized.
-    // Consider the ROS is initialized fully only if log below shows twice
-    // "client: Closing Realm file: /tmp/ros117521-7-1eiqt7a/internal_data/permission/__auth.realm"
-    // https://github.com/realm/realm-object-server/issues/1297
-    var logFindingCounter = 2
-
     stopRealmObjectServer(function(err) {
         if(err) {
           return;
@@ -56,12 +70,6 @@ function startRealmObjectServer(done) {
                         { env: env, cwd: path});
                 // local config:
                 syncServerChildProcess.stdout.on('data', (data) => {
-                    if (logFindingCounter != 0 && /client: Closing Realm file: .*__auth.realm/.test(data)) {
-                        if (logFindingCounter == 1) {
-                            done()
-                        }
-                        logFindingCounter--
-                    }
                     winston.info(`stdout: ${data}`);
                 });
 
@@ -72,6 +80,11 @@ function startRealmObjectServer(done) {
                 syncServerChildProcess.on('close', (code) => {
                     winston.info(`child process exited with code ${code}`);
                 });
+
+                tryUntilROSStart(options, function(err, resp) {
+                    winston.info('>>>>>>>>>>>>>>>>>>> [ROS] server started <<<<<<<<<<<<<<<<<<<');
+                    done()
+                });
             }
         });
     });
@@ -94,7 +107,7 @@ function stopRealmObjectServer(callback) {
 dispatcher.onGet("/start", function(req, res) {
     startRealmObjectServer(() => {
         res.writeHead(200, {'Content-Type': 'text/plain'});
-        res.end('Starting a server');
+        res.end('Server started');
     })
 });