- Addresses issues identified during code review

lib/Router/Cron.php

@@ -1,8 +1,10 @@
 <?php
 namespace MailPoet\Router;
 
+use Carbon\Carbon;
 use MailPoet\Cron\Daemon;
 use MailPoet\Cron\Supervisor;
+use MailPoet\Models\Setting;
 
 if(!defined('ABSPATH')) exit;
 
@@ -19,13 +21,12 @@ class Cron {
   function stop() {
     $daemon = new Daemon();
     if(!$daemon->daemon ||
-      $daemon->daemonData['status'] !== 'started'
+      $daemon->daemon['status'] !== 'started'
     ) {
       $result = false;
     } else {
-      $daemon->daemonData['status'] = 'stopping';
-      $daemon->daemon->value = json_encode($daemon->daemonData);
-      $result = $daemon->daemon->save();
+      $daemon->daemon['status'] = 'stopping';
+      $result = $daemon->saveDaemon($daemon->daemon);
     }
     wp_send_json(
       array(
@@ -35,7 +36,28 @@ class Cron {
   }
 
   function getStatus() {
-    $daemon = new \MailPoet\Cron\BootStrapMenu();
-    wp_send_json($daemon->bootStrap());
+    $daemon = Setting::where('name', 'cron_daemon')
+      ->findOne();
+    wp_send_json(
+      ($daemon) ?
+        array_merge(
+          array(
+            'timeSinceStart' =>
+              Carbon::createFromFormat(
+                'Y-m-d H:i:s',
+                $daemon->created_at,
+                'UTC'
+              )->diffForHumans(),
+            'timeSinceUpdate' =>
+              Carbon::createFromFormat(
+                'Y-m-d H:i:s',
+                $daemon->updated_at,
+                'UTC'
+              )->diffForHumans()
+          ),
+          unserialize($daemon->value)
+        ) :
+        "false"
+    );
   }
 }