fix: Limits the events processed in the cron to avoid overflows and t…

…imeouts (Thanks @AndyHubert). (#203)
xAPI-vle · Aug 1, 2018 · c680b0c · c680b0c
1 parent 96cafc1
commit c680b0c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/classes/log/store.php b/classes/log/store.php
@@ -77,6 +77,10 @@ protected function insert_event_entries(array $events) {
         }
     }
 
+    public function get_max_batch_size() {
+        return $this->get_config('maxbatchsize', 100);
+    }
+
     public function process_events(array $events) {
         global $DB;
         global $CFG;
@@ -108,7 +112,7 @@ public function process_events(array $events) {
                 'lrs_endpoint' => $this->get_config('endpoint', ''),
                 'lrs_username' => $this->get_config('username', ''),
                 'lrs_password' => $this->get_config('password', ''),
-                'lrs_max_batch_size' => $this->get_config('maxbatchsize', 100),
+                'lrs_max_batch_size' => $this->get_max_batch_size(),
             ],
         ];
         $loadedevents = \src\handler($handlerconfig, $events);

diff --git a/classes/task/emit_task.php b/classes/task/emit_task.php
@@ -39,7 +39,12 @@ public function execute() {
         global $DB;
         $manager = get_log_manager();
         $store = new store($manager);
-        $extractedevents = $DB->get_records('logstore_xapi_log');
+        $conditions = null;
+        $sort = '';
+        $fields = '*';
+        $limitfrom = 0;
+        $limitnum = $store->get_max_batch_size();
+        $extractedevents = $DB->get_records('logstore_xapi_log', $conditions, $sort, $fields, $limitfrom, $limitnum);
         $loadedevents = $store->process_events($extractedevents);
         $loadedeventids = array_map(function ($transformedevent) {
             return $transformedevent['eventid'];