Fix #1021 service status

front/src/config/demo.json

@@ -1124,7 +1124,7 @@
       "selector": "telegram",
       "version": "0.1.0",
       "has_message_feature": true,
-      "status": "NOT_CONFIGURED",
+      "status": "RUNNING",
       "created_at": "2020-04-11T18:41:40.053Z",
       "updated_at": "2020-10-30T07:44:07.518Z"
     },
@@ -1168,7 +1168,7 @@
       "selector": "zwave",
       "version": "0.1.0",
       "has_message_feature": false,
-      "status": "NOT_CONFIGURED",
+      "status": "RUNNING",
       "created_at": "2020-04-11T18:41:40.056Z",
       "updated_at": "2020-10-30T07:44:07.594Z"
     },
@@ -1223,7 +1223,7 @@
       "selector": "openweather",
       "version": "0.1.0",
       "has_message_feature": false,
-      "status": "NOT_CONFIGURED",
+      "status": "RUNNING",
       "created_at": "2020-08-19T13:04:57.309Z",
       "updated_at": "2020-10-30T07:44:07.814Z"
     },

front/src/config/i18n/en.json

@@ -1015,10 +1015,6 @@
         "title": "Stopped",
         "detail": "Service stopped by user"
       },
-      "NOT_CONFIGURED": {
-        "title": "Not configured",
-        "detail": "Service is not configured"
-      },
       "ERROR": {
         "title": "Error",
         "detail": "Service failed to start."

front/src/config/i18n/fr.json

@@ -1015,10 +1015,6 @@
         "title": "Arrêté",
         "detail": "Service arrêté par un utilisateur"
       },
-      "NOT_CONFIGURED": {
-        "title": "Non configuré",
-        "detail": "Service non configuré"
-      },
       "ERROR": {
         "title": "En erreur",
         "detail": "Service en erreur lors du démarrage."

front/src/routes/settings/settings-service/ServiceItem.jsx

@@ -1,13 +1,12 @@
 import { Component } from 'preact';
 import { Text, Localizer } from 'preact-i18n';
 import { Link } from 'preact-router';
-import cx from 'classnames';
 import get from 'get-value';
 
 import { RequestStatus } from '../../../utils/consts';
 import { SERVICE_STATUS } from '../../../../../server/utils/constants';
 
-const STARTED_STATUS = [SERVICE_STATUS.RUNNING, SERVICE_STATUS.NOT_CONFIGURED];
+const STARTED_STATUS = [SERVICE_STATUS.RUNNING];
 const HIDDEN_ACTION_STATUS = [SERVICE_STATUS.UNKNOWN, SERVICE_STATUS.DISABLED];
 
 class ServiceItem extends Component {
@@ -73,11 +72,7 @@ class ServiceItem extends Component {
                 checked={started}
                 onClick={this.changeState}
               />
-              <span
-                class={cx('custom-switch-indicator', {
-                  'bg-secondary': service.status === SERVICE_STATUS.NOT_CONFIGURED
-                })}
-              />
+              <span class="custom-switch-indicator" />
             </label>
           )}
         </td>

server/api/controllers/service.controller.js

@@ -44,7 +44,7 @@ module.exports = function ServiceController(gladys) {
    * }
    */
   async function stop(req, res) {
-    const service = await gladys.service.stop(req.params.service_name);
+    const service = await gladys.service.stop(req.params.service_name, null, true);
     if (!service) {
       res.status(404);
     }

server/lib/service/service.start.js

@@ -36,7 +36,7 @@ async function start(name, pod_id = null) {
     } catch (e) {
       if (e instanceof ServiceNotConfiguredError) {
         // If service fails to start due to configuration error, set service status to not configured
-        status = SERVICE_STATUS.NOT_CONFIGURED;
+        status = SERVICE_STATUS.RUNNING;
         logger.info(`Service ${name} is not configured, so it was not started.`);
       } else {
         // If service fails to start, set service status to error

server/lib/service/service.startAll.js

@@ -29,9 +29,6 @@ async function startAll() {
       case SERVICE_STATUS.STOPPED:
         logger.info(`Service ${serviceKey} was manually stopped, so it is ignored at startup`);
         return false;
-      case SERVICE_STATUS.LOADING:
-        logger.warn(`Service ${serviceKey} was not correctly loaded at last startup, it will be avoid for now.`);
-        return false;
       default:
         return true;
     }

server/lib/service/service.stop.js

@@ -7,11 +7,12 @@ const db = require('../../models');
  * @description Stops one service by name
  * @param {string} name - The name of the service.
  * @param {string} pod_id - ID of Gladys instance.
+ * @param {boolean} userAction - Manually stopped?
  * @returns {Promise<Object>} Requested service.
  * @example
  * service.stop('telegram');
  */
-async function stop(name, pod_id = null) {
+async function stop(name, pod_id = null, userAction = false) {
   // Load service from DB
   const serviceInDb = await db.Service.findOne({
     where: {
@@ -26,16 +27,14 @@ async function stop(name, pod_id = null) {
     let status;
     try {
       await service.stop();
-      // Once service started, set service status to stopped
-      status = SERVICE_STATUS.STOPPED;
-    } catch (e) {
-      // If service fails to start, set service status to error
-      status = SERVICE_STATUS.ERROR;
-      throw e;
     } finally {
-      // Store service status
-      serviceInDb.set({ status });
-      await serviceInDb.save();
+      // Once service manually stopped, set service status to stopped
+      if (userAction) {
+        status = SERVICE_STATUS.STOPPED;
+        // Store service status
+        serviceInDb.set({ status });
+        await serviceInDb.save();
+      }
     }
   } catch (e) {
     logger.warn(`Unable to stop service ${name}`, e);

server/migrations/20201220100508-service-remove-not-configured-status.js

@@ -0,0 +1,17 @@
+const db = require('../models');
+
+module.exports = {
+  up: async () => {
+    await db.Service.update(
+      {
+        status: 'RUNNING',
+      },
+      {
+        where: {
+          status: ['NOT_CONFIGURED', 'STOPPED'],
+        },
+      },
+    );
+  },
+  down: async () => {},
+};

server/test/lib/service/service.start.test.js

@@ -75,7 +75,7 @@ describe('service.start', () => {
     assert.calledOnce(serviceImpl.start);
   });
 
-  it('should fail starting a service (dut to config), and set status to NOT_CONFIGURED', async () => {
+  it('should fail starting a service (dut to config), and set status to RUNNING', async () => {
     serviceImpl.start = fake.rejects(new ServiceNotConfiguredError('error'));
 
     const result = await service.start(serviceName);
@@ -86,8 +86,8 @@ describe('service.start', () => {
       },
     });
 
-    expect(serviceInDb.status).eq(SERVICE_STATUS.NOT_CONFIGURED);
-    expect(result.status).eq(SERVICE_STATUS.NOT_CONFIGURED);
+    expect(serviceInDb.status).eq(SERVICE_STATUS.RUNNING);
+    expect(result.status).eq(SERVICE_STATUS.RUNNING);
     assert.calledOnce(serviceImpl.start);
   });
 

server/test/lib/service/service.startAll.test.js

@@ -109,7 +109,7 @@ describe('service.startAll', () => {
         name: serviceName,
       },
     });
-    expect(serviceInDb.status).eq(SERVICE_STATUS.LOADING);
-    assert.notCalled(serviceImpl.start);
+    expect(serviceInDb.status).eq(SERVICE_STATUS.RUNNING);
+    assert.calledOnce(serviceImpl.start);
   });
 });

server/test/lib/service/service.stop.test.js

@@ -21,6 +21,7 @@ describe('service.stop', () => {
       selector: serviceName,
       name: serviceName,
       version: '0.1.0',
+      status: SERVICE_STATUS.UNKNOWN,
     };
 
     stateManager = new StateManager();
@@ -42,7 +43,7 @@ describe('service.stop', () => {
     sinon.reset();
   });
 
-  it('should stop a service, and set status to RUNNING', async () => {
+  it('should stop a service, and not change status', async () => {
     serviceImpl.stop = fake.resolves(null);
 
     const result = await service.stop(serviceName);
@@ -53,24 +54,24 @@ describe('service.stop', () => {
       },
     });
 
-    expect(serviceInDb.status).eq(SERVICE_STATUS.STOPPED);
-    expect(result.status).eq(SERVICE_STATUS.STOPPED);
+    expect(serviceInDb.status).eq(SERVICE_STATUS.UNKNOWN);
+    expect(result.status).eq(SERVICE_STATUS.UNKNOWN);
     assert.calledOnce(serviceImpl.stop);
   });
 
-  it('should fail stoping a service, and set status to ERROR', async () => {
+  it('should fail stoping a service, change status to STOPPED', async () => {
     serviceImpl.stop = fake.rejects(null);
 
-    const result = await service.stop(serviceName);
+    const result = await service.stop(serviceName, null, true);
 
     const serviceInDb = await db.Service.findOne({
       where: {
         name: serviceName,
       },
     });
 
-    expect(serviceInDb.status).eq(SERVICE_STATUS.ERROR);
-    expect(result.status).eq(SERVICE_STATUS.ERROR);
+    expect(serviceInDb.status).eq(SERVICE_STATUS.STOPPED);
+    expect(result.status).eq(SERVICE_STATUS.STOPPED);
     assert.calledOnce(serviceImpl.stop);
   });
 
@@ -92,8 +93,8 @@ describe('service.stop', () => {
       },
     });
 
-    expect(serviceInDb.status).eq(SERVICE_STATUS.STOPPED);
-    expect(result.status).eq(SERVICE_STATUS.STOPPED);
+    expect(serviceInDb.status).eq(SERVICE_STATUS.LOADING);
+    expect(result.status).eq(SERVICE_STATUS.LOADING);
     assert.calledOnce(serviceImpl.stop);
   });
 });

server/utils/constants.js

@@ -28,7 +28,6 @@ const SERVICE_STATUS = {
   RUNNING: 'RUNNING',
   STOPPED: 'STOPPED',
   ERROR: 'ERROR',
-  NOT_CONFIGURED: 'NOT_CONFIGURED',
 };
 
 const SYSTEM_VARIABLE_NAMES = {