Release 1.182.0

intelliboard · Mar 26, 2024 · abeed41 · abeed41
1 parent 829eefa
commit abeed41
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 16 deletions.
diff --git a/classes/helpers/DBHelper.php b/classes/helpers/DBHelper.php
@@ -545,6 +545,18 @@ public static function get_db_client($penetrationtype = self::PENETRATION_TYPE_I
 
         if (in_array($CFG->dbtype, self::$supporteddbclients[$penetrationtype])) {
 
+            if (isset(self::$customdbclient[$penetrationtype]) && !self::is_database_connected(self::$customdbclient[$penetrationtype])) {
+                try {
+                    self::$customdbclient[$penetrationtype]->dispose();
+                } catch (\Throwable $e) {
+                    // Ignore if connection already disposed.
+
+                    $e->getMessage();
+                }
+
+                unset(self::$customdbclient[$penetrationtype]);
+            }
+
             if (!isset(self::$customdbclient[$penetrationtype])) {
                 $db = self::get_driver_instance($CFG->dbtype, $penetrationtype);
                 $db->connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, $CFG->dboptions);
@@ -556,4 +568,13 @@ public static function get_db_client($penetrationtype = self::PENETRATION_TYPE_I
 
         return $DB;
     }
+
+    public static function is_database_connected($db) {
+        try {
+            $db->get_records_sql("SELECT 1");
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 }
diff --git a/classes/services/migration_service.php b/classes/services/migration_service.php
@@ -25,6 +25,7 @@
 
 namespace local_intellidata\services;
 
+use local_intellidata\helpers\DBHelper;
 use local_intellidata\helpers\MigrationHelper;
 use local_intellidata\helpers\SettingsHelper;
 use local_intellidata\helpers\ParamsHelper;
@@ -64,14 +65,36 @@ public function __construct($exportformatkey = null, $exportservice = null) {
      * @param false $cronprocessing
      */
     public function process($params = null, $cronprocessing = false) {
+        global $DB, $CFG;
 
         $alltables = $this->tables;
         $tables = (!empty($params['datatype']) && isset($alltables[$params['datatype']])) ?
             [$params['datatype'] => $alltables[$params['datatype']]] : $this->tables;
 
         if (count($tables)) {
             foreach ($tables as $table) {
-                $this->export_table($table, $params, $cronprocessing);
+                $retries = 1;
+                do {
+                    try {
+                        $this->export_table($table, $params, $cronprocessing);
+                        $continue = false;
+                    } catch (\dml_exception $e) {
+                        if (!isset($CFG->intellidata_db_reconnects) || $CFG->intellidata_db_reconnects == 0) {
+                            throw $e;
+                        }
+
+                        sleep($retries);
+                        $DB = DBHelper::get_db_client(DBHelper::PENETRATION_TYPE_EXTERNAL);
+                        $continue = true;
+                        $reconnectsremaining = $CFG->intellidata_db_reconnects - $retries;
+                        mtrace($e->getMessage());
+                        mtrace("Database connection lost: Reconnected: {$reconnectsremaining} reconnection attempts remaining. ");
+
+                        if (++$retries > $CFG->intellidata_db_reconnects) {
+                            throw $e;
+                        }
+                    }
+                } while ($continue);
 
                 // If it is processing by cron, we need to allow only one table processing.
                 if ($cronprocessing) {

diff --git a/classes/services/new_export_service.php b/classes/services/new_export_service.php
@@ -102,9 +102,17 @@ public function insert_records_event($table, $dataobjects) {
             $requiredatatype = !isset($entity::$datatype);
 
             foreach ($dataobjects as $dataobject) {
-                $record = $DB->get_record($table, $this->prepare_data_for_query($table, (array)$dataobject));
+                if ($requiredatatype && !$this->filter_id($entity::TYPE, (object)$dataobject)) {
+                    $params = $this->prepare_data_for_query($table, (array)$dataobject);
+                    $records = $DB->get_records($table, $params, 'id DESC', '*', 0, 1);
+                    if (!$record = array_shift($records)) {
+                        continue;
+                    }
+                } else {
+                    $record = (object)$dataobject;
+                }
 
-                if ($requiredatatype && !$this->filter($entity::TYPE, $record)) {
+                if (!isset($record) || ($requiredatatype && !$this->filter($entity::TYPE, $record))) {
                     continue;
                 }
 
@@ -400,6 +408,29 @@ private function filter($datatype, $data) {
         return $access;
     }
 
+    /**
+     * @param string $table
+     * @param \stdClass $data
+     * @return bool
+     */
+    private function filter_id($datatype, $data) {
+        $needid = true;
+        switch ($datatype) {
+            case 'participation':
+                if (!in_array($data->crud, ['c', 'u']) || !$data->userid ||
+                    !in_array($data->contextlevel, [CONTEXT_COURSE, CONTEXT_MODULE])) {
+                    $needid = false;
+                }
+                break;
+            case 'userlogins':
+                $needid = isset($data->eventname) && ($data->eventname == '\core\event\user_loggedin') &&
+                            $data->contextid == 1;
+                break;
+        }
+
+        return $needid;
+    }
+
     /**
      * @param string $datatype
      * @param \stdClass $data

diff --git a/lib.php b/lib.php
@@ -142,4 +142,3 @@ function local_intellidata_after_config() {
 function local_intellidata_before_session_start() {
     local_intellidata_after_config();
 }
-
diff --git a/settings.php b/settings.php
@@ -28,6 +28,7 @@
 
 use local_intellidata\helpers\SettingsHelper;
 use local_intellidata\helpers\StorageHelper;
+use local_intellidata\helpers\ParamsHelper;
 
 defined('MOODLE_INTERNAL') || die;
 
@@ -387,16 +388,18 @@
     );
     $settings->add($setting);
 
-    $name = 'newtracking';
-    $setting = new admin_setting_configcheckbox(
-        $pluginname . '/' . $name,
-        get_string($name, $pluginname),
-        '',
-        SettingsHelper::get_defaut_config_value($name),
-        true,
-        false
-    );
-    $settings->add($setting);
+    if (ParamsHelper::get_release() >= 3.8) {
+        $name = 'newtracking';
+        $setting = new admin_setting_configcheckbox(
+            $pluginname . '/' . $name,
+            get_string($name, $pluginname),
+            '',
+            SettingsHelper::get_defaut_config_value($name),
+            true,
+            false
+        );
+        $settings->add($setting);
+    }
 
     $name = 'divideexportbydatatype';
     $setting = new admin_setting_configcheckbox(

diff --git a/version.php b/version.php
@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2024031900;
+$plugin->version  = 2024032100;
 $plugin->requires = 2017111300;
-$plugin->release = '1.176.0';
+$plugin->release = '1.182.0';
 $plugin->maturity = MATURITY_STABLE;
 $plugin->component = 'local_intellidata';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,4 +142,3 @@ function local_intellidata_after_config() {
		function local_intellidata_before_session_start() {
		local_intellidata_after_config();
		}