Runtime-check teenusele lisatud serveri ühenduse kontroll

Signed-off-by: Indrek Jentson <indrek.jentson@ut.ee>

controllers/api/v1/check.js

@@ -33,6 +33,13 @@ router.get('/', function(req, res) {
             logger.debug('msg: ' + JSON.stringify(msg));
             results.push(msg);
             return results;
+        }).then(function(results){
+            logger.debug('check 4');
+            return checker.checkServer();
+        }).then(function(msg){
+            logger.debug('msg: ' + JSON.stringify(msg));
+            results.push(msg);
+            return results;
         }).then(function (results){
             logger.debug('publish, R is ' + (results?results.length:'?'));
             logger.debug('results: ' + (results?JSON.stringify(results):'?'))

package.json

 {
   "name": "keeleliin-wrapper-service",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "scripts": {
     "start": "node ./app.js",

src/service/checkService.js

@@ -73,6 +73,21 @@ var CheckService = function(){
         });
     }
 
+    this.checkServer = function() {
+        return new Promise( function(resolve, reject) {
+            try {
+                request.get(config.serverUrl + ':3000', function(err, replay) {
+                    if (err) resolve({type:'ERR', msg: 'ühendus serveriga ' + config.serverUr + ' ei tööta: ' + err});
+                    else {
+                        resolve({type:'OK', msg: 'ühendus serveriga ' + config.serverUr + ' töötab'});
+                    }
+                });
+            } catch (err) {
+                resolve({type:'ERR', msg:err.message});
+            }
+        });
+    }
+
     this.checkTemplate = function() {
         return new Promise( function(resolve, reject) {
             try {

src/service/integration/installService.js

@@ -17,6 +17,7 @@ var InstallService = function() {
         }
 
         var messages = [];
+        logger.debug(config.integration);
 
         async.each(config.integration, function (serverConf, innerCb) {
 

src/service/wrapperService.js

@@ -27,7 +27,7 @@ function WrapperService() {
                 }
 
                 sessionService.closeSession(session, function (err, session) {
-                    logger.debug('Sessioon on lõpetanud ja savestatud. isAsync:' + session.isAsync);
+                    logger.debug('Sessioon on lõpetanud ja salvestatud. isAsync:' + session.isAsync);
                     if (session.isAsync === false) {
                         logger.debug('Send response');
                         if(err){

test/integration/payload.js

@@ -19,7 +19,7 @@ describe('Services', function() {
     buildData = function(body, fileName) {
         var form = {};
 
-        form['body'] = body;
+        form['body'] = JSON.stringify(body);
 
         var file =  { key: 'content', path: fileName };
         var attachment =  fs.createReadStream( fileName );
@@ -50,13 +50,13 @@ describe('Services', function() {
             var tmpPath = config.fs.tmpPath;
             var source = tmpPath + '/test.txt';
             fs.writeFileSync(source, 'Faili sisu');
-            var formData = buildData(JSON.stringify(body), source);
+            var formData = buildData(body, source);
             request
                 .post({"url":url+'/api/v1/service', formData:formData}, function(err,res,body) {
                     if (err) {
                         throw err;
                     }
-                    // console.log('res: '+JSON.stringify(res));
+                    console.log('sync res: '+JSON.stringify(res));
                     var body = JSON.parse(res.body);
                     body.response.should.have.property('success');
                     body.response.success.should.equal(true);
@@ -78,61 +78,20 @@ describe('Services', function() {
             var tmpPath = config.fs.tmpPath;
             var source = tmpPath + '/test.txt';
             fs.writeFileSync(source, 'Faili sisu');
-            var formData = buildData(JSON.stringify(body), source);
+            var formData = buildData(body, source);
+            console.log('async form: '+JSON.stringify(formData));
             request
                 .post({"url":url+'/api/v1/service', formData:formData}, function(err,res,body) {
                     if (err) {
                         throw err;
                     }
-                    // console.log('res: '+JSON.stringify(res));
+                    console.log('async res: '+JSON.stringify(res));
                     var body = JSON.parse(res.body);
                     body.response.should.have.property('success');
                     body.response.success.should.equal(true);
                     done();
                 });
 
-/*
-            request(url)
-                .post('/api/v1/service')
-                .field('body', body)
-                .attach('files', source)
-                .expect('Content-Type', /json/)
-                .expect(200) //Status code
-                .end(function(err,res) {
-                    if (err) {
-                        throw err;
-                    }
-
-                    res.body.should.have.property('success');
-                    if (res.body.success) {
-                        res.body.should.have.property('response');
-                        res.body.response.should.have.property('sessionId');
-                        res.body.response.message.should.equal('RUNNING');
-                        res.body.response.should.not.have.property('pipecontent');
-
-                        var sessionId = res.body.response.serviceId;
-
-                        setTimeout(function () {
-                            request(url)
-                                .get('/api/v1/service/' + sessionId)
-                                .expect(200)
-                                .expect('Content-Type', /json/)
-                                .end(function(err, res) {
-                                    if (err) {
-                                        throw err;
-                                    }
-                                    res.body.should.not.have.property('errors');
-                                    res.body.response.message.should.equal('OK');
-                                    res.body.response.should.have.property('pipecontent');
-                                    done();
-                                });
-                        }, 5000);
-                    } else {
-                        console.log('THIS is NOT working :(');
-                        done()
-                    };
-                });
-                */
         });
     });
 });
\ No newline at end of file