Changeset 2940115

Timestamp:

07/19/2023 02:29:15 AM (3 years ago)

Author:

deryck

Message:

Performance improved while deleting old events

Location:

logdash-activity-log/trunk

Files:

• README.txt (modified) (3 diffs)
• logdash-activity-log.php (modified) (2 diffs)
• src/Actions/RemoveExpiredLog.php (modified) (4 diffs)

logdash-activity-log/trunk/README.txt

@@ -6 +6 @@
 Tested up to: 6.2
 Requires PHP: 7.4
-Stable tag: 1.1.2
+Stable tag: 1.1.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -76 +76 @@
 == Changelog ==
 
+= 1.1.3 =
+* Performance improved while deleting old events
+
 = 1.1.2 =
 * Fixed a critical bug with Autoload
@@ -89 +92 @@
 == Upgrade Notice ==
 
+= 1.1.3 =
+* Performance improved while deleting old events
+
 = 1.1.2 =
 * Fixed a critical bug with Autoload

logdash-activity-log/trunk/logdash-activity-log.php

@@ -9 +9 @@
  * Plugin URI:        https://deryckoe.com/logdash-activity-log
  * Description:       The ultimate solution for tracking activities and security issues on your WordPress site.
- * Version:           1.1.2
+ * Version:           1.1.3
  * Author:            Deryck Oñate
  * Author URI:        http://deryckoe.com
@@ -27 +27 @@
  * Currently plugin version.
  */
-define( 'LOGDASH_VERSION', '1.1.2' );
+define( 'LOGDASH_VERSION', '1.1.3' );
 
 /**

logdash-activity-log/trunk/src/Actions/RemoveExpiredLog.php

@@ -12 +12 @@
     public function __construct() {
         global $wpdb;
-        $this->wpdb   = $wpdb;
+        $this->wpdb = $wpdb;
     }
 
@@ -28 +28 @@
 
     public function actions() {
-        add_action( 'init', [ $this, 'delete_expired_log' ] );
+
+//      add_action( 'init', [ $this, 'delete_expired_log' ] );
+        add_action( 'init', [ $this, 'register_expired_log_job' ] );
+        add_action( 'delete_expired_log', [ $this, 'delete_expired_log' ] );
+    }
+
+    public function register_expired_log_job(  ) {
+        if ( ! wp_next_scheduled( 'delete_expired_log' ) ) {
+            wp_schedule_single_event( time(), 'delete_expired_log' );
+        }
     }
 
     public function delete_expired_log() {
-
         $options = $this->get_options();
 
@@ -42 +50 @@
         $activity_log  = DB::log_table();
         $activity_meta = DB::meta_table();
-        $site_id = get_current_blog_id();
+        $site_id       = get_current_blog_id();
 
-        $this->wpdb->query( "DELETE l FROM $activity_log l
-                               LEFT JOIN $activity_meta m
-                                 ON l.ID = m.event_id
-                               WHERE FROM_UNIXTIME(l.created, '%Y-%m-%d') < DATE_SUB(CURRENT_DATE, INTERVAL {$days} DAY) AND site_id = {$site_id};" );
+        $this->wpdb->query( "DELETE FROM $activity_log WHERE FROM_UNIXTIME(created, '%Y-%m-%d') < DATE_SUB(CURRENT_DATE, INTERVAL {$days} DAY) AND {$site_id} = 1;" );
+        $this->wpdb->query( "DELETE FROM $activity_meta WHERE NOT EXISTS ( SELECT 1 FROM $activity_log WHERE $activity_log.ID = $activity_meta.event_id);" );
 
         $rows_affected = $this->wpdb->rows_affected;
@@ -55 +61 @@
         }
 
-        update_option('logdash_deleted_events', [
+        update_option( 'logdash_deleted_events', [
             'rows' => $rows_affected,
             'date' => time(),