Merge pull request #4446 from corentin-soriano/improve_cron_detection

Improve teampass cron detection.
nilsteampassnet · Nov 6, 2024 · e3318a4 · e3318a4
2 parents 0a5efec + b70dbfe
commit e3318a4
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 12 deletions.
diff --git a/pages/admin.php b/pages/admin.php
@@ -28,9 +28,6 @@
  * @license   GPL-3.0
  * @see       https://www.teampass.net
  */
-use TiBeN\CrontabManager\CrontabJob;
-use TiBeN\CrontabManager\CrontabAdapter;
-use TiBeN\CrontabManager\CrontabRepository;
 use TeampassClasses\SessionManager\SessionManager;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 use TeampassClasses\Language\Language;
@@ -199,9 +196,17 @@
 
 // Instantiate the adapter and repository
 try {
-    $crontabRepository = new CrontabRepository(new CrontabAdapter());
-    $results = $crontabRepository->findJobByRegex('/Teampass\ scheduler/');
-    if (count($results) === 0) {
+    // Get last cron execution timestamp
+    $result = DB::query(
+        'SELECT valeur
+        FROM ' . prefixTable('misc') . '
+        WHERE type = %s AND intitule = %s and valeur >= %d',
+        'admin',
+        'last_cron_exec',
+        time() - 600 // max 10 minutes
+    );
+
+    if (DB::count() === 0) {
         ?>
                             <div class="callout callout-info alert-dismissible mt-3" role="alert">
                                 <h5><i class="fa-solid fa-info mr-2"></i><?php echo $lang->get('information'); ?></h5>

diff --git a/pages/tasks.php b/pages/tasks.php
@@ -28,9 +28,6 @@
  * @license   GPL-3.0
  * @see       https://www.teampass.net
  */
-use TiBeN\CrontabManager\CrontabJob;
-use TiBeN\CrontabManager\CrontabAdapter;
-use TiBeN\CrontabManager\CrontabRepository;
 use TeampassClasses\SessionManager\SessionManager;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 use TeampassClasses\Language\Language;
@@ -126,9 +123,17 @@
 
 // Instantiate the adapter and repository
 try {
-    $crontabRepository = new CrontabRepository(new CrontabAdapter());
-    $results = $crontabRepository->findJobByRegex('/Teampass\ scheduler/');
-    if (count($results) === 0) {
+    // Get last cron execution timestamp
+    $result = DB::query(
+        'SELECT valeur
+        FROM ' . prefixTable('misc') . '
+        WHERE type = %s AND intitule = %s and valeur >= %d',
+        'admin',
+        'last_cron_exec',
+        time() - 600 // max 10 minutes
+    );
+
+    if (DB::count() === 0) {
         ?>
                                             <div class="callout callout-info alert-dismissible mt-3">
                                                 <h5><i class="fa-solid fa-info mr-2"></i><?php echo $lang->get('information'); ?></h5>

diff --git a/sources/scheduler.php b/sources/scheduler.php
@@ -46,6 +46,23 @@
 $configManager = new ConfigManager();
 $SETTINGS = $configManager->getAllSettings();
 
+// Update row if exists
+$updated = DB::update(
+    prefixTable('misc'),
+    ['valeur' => time()],
+    'type = "admin" AND intitule = "last_cron_exec"'
+);
+
+// Insert row if not exists
+if ($updated === 0) {
+    DB::insert(
+        prefixTable('misc'), [
+        'type' => 'admin',
+        'intitule' => 'last_cron_exec',
+        'valeur' => time()
+    ]);
+}
+
 // Build the scheduler jobs
 // https://github.com/peppeocchi/php-cron-scheduler
 $scheduler->php(__DIR__.'/../scripts/background_tasks___userKeysCreation.php')->everyMinute($SETTINGS['user_keys_job_frequency'] ?? '1');