fix: simplify logging interations + records

Explicitly formatting the message with the record is no longer required, as the context is provided when outputting the logs in the streams of primary concern
catalyst · Jul 24, 2023 · 4d88c30 · 4d88c30
1 parent a75a1b8
commit 4d88c30
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/classes/local/execution/engine.php b/classes/local/execution/engine.php
@@ -747,10 +747,6 @@ private function setup_logging() {
             if (isset($record['context']['step'])) {
                 $record['message'] = '{step}: ' . $record['message'];
             }
-            if (isset($record['context']['record'])) {
-                $record['message'] .= ' {record}';
-                $record['context']['record'] = json_encode($record['context']['record']);
-            }
             return $record;
         });
 

diff --git a/classes/local/execution/iterators/dataflow_iterator.php b/classes/local/execution/iterators/dataflow_iterator.php
@@ -224,9 +224,7 @@ public function next($caller) {
             $this->stepvars->set('iterations', $this->iterationcount);
 
             // Log the iteration for real steps.
-            if (!$this->steptype instanceof flow_cap) {
-                $this->step->log->info('Iteration ' . $this->iterationcount, ['record' => $newvalue]);
-            }
+            $this->step->log->info('Iteration ' . $this->iterationcount, (array) $newvalue);
         } catch (\Throwable $e) {
             $this->step->log->error($e->getMessage());
             $this->step->engine->abort();