Support for multi-line and tail_lines options.

PierreF · PierreF · commit 5a624aa0b155 · 2013-09-30T15:13:09.000+02:00
diff --git a/beaver/worker/tail.py b/beaver/worker/tail.py
@@ -353,7 +353,13 @@ def _seek_to_end(self):
             self._log_debug('tailing {0} lines'.format(self._tail_lines))
             lines = self.tail(self._filename, encoding=self._encoding, window=self._tail_lines, position=current_position)
             if lines:
-                self._callback_wrapper(lines)
+                self._last_activity = time.time()
+                if self._multiline_regex_after or self._multiline_regex_before:
+                    # Multiline is enabled for this file.
+                    events = self._multiline_merge(lines)
+                else:
+                    events = lines
+                self._callback_wrapper(events)
 
         return
 
diff --git a/beaver/worker/worker.py b/beaver/worker/worker.py
@@ -332,7 +332,14 @@ def _seek_to_end(self):
 
                 lines = self.tail(data['file'].name, encoding=encoding, window=tail_lines, position=current_position)
                 if lines:
-                    self._callback_wrapper(filename=data['file'].name, lines=lines)
+                    self._file_map[fid]['last_activity'] = time.time()
+
+                    if self._file_map[fid]['multiline_regex_after'] or self._file_map[fid]['multiline_regex_before']:
+                        # Multiline is enabled for this file.
+                        events = self._multiline_merge(lines=lines, fid=fid)
+                    else:
+                        events = lines
+                    self._callback_wrapper(filename=data['file'].name, lines=events)
 
         self.unwatch_list(unwatch_list)
 
