onlylogs 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d17b58f1bc49d7f70ea61867d8c8e78be1fc25f1ede62f0b477764c97b78752
-  data.tar.gz: 3de1a2520cfb58fc74eab4152a43e20dc0082ec5099272efee00761c15ce3e1e
+  metadata.gz: baff3b51025f63d5ba3537ebf50f48c75478e64287ea98e9634d19fe070a42f5
+  data.tar.gz: 47c2a4a23cfbfe44c25e0fbdbb96413e49aac96fe7ff6695c3440ec00aa0b08b
 SHA512:
-  metadata.gz: 7079c7f67be0048382b9029ef636a17c6de654c49ae1c17346cfbfad99e7015a1ffed9a1ef1c4313b45f6cad2bed839dc804f39b616f46bb55d4203c3cde8bc8
-  data.tar.gz: 4630f69bf7066024413e4251747cc0da907f8d7912eab6eae78fb1c4b9ac3fa4d2bb026e0cc5e9452e9e78c289bf120c82724207426f88e7886b6ea92077d337
+  metadata.gz: 1676249dd2d66f2b9b4032473313fac9306c2f05283dfa927c229af55f5ace1f7a740456231d15de5a92b7de5b7fc56a54ecdc643e1adc33e53718ec5e2befce
+  data.tar.gz: 73d9f8296c302d3c84d5ae74748a0ca6601c26f00722b33a1fe067f1c1e62810b6e70fac8825e04763de0640759caa785092ba56f8df69f3dc8bee0373150056

data/app/channels/onlylogs/logs_channel.rb

@@ -68,7 +68,7 @@ module Onlylogs
 
     def cleanup_existing_operations
       if @batch_sender
-        @batch_sender.stop
+        @batch_sender.stop(send_remaining_lines: false)
         @batch_sender = nil
       end
 
@@ -102,10 +102,7 @@ module Onlylogs
               #   next
               # end
 
-              lines_to_send << {
-                line_number: log_line.number,
-                html: render_log_line(log_line)
-              }
+              lines_to_send << render_log_line(log_line)
             end
 
             if lines_to_send.any?
@@ -129,10 +126,21 @@ module Onlylogs
 
       @log_watcher_running = false
 
-      return unless @log_watcher_thread&.alive?
+      # Wait for graceful shutdown
+      if @log_watcher_thread&.alive?
+        @log_watcher_thread.join(3)
 
-      @log_watcher_thread.kill
-      @log_watcher_thread.join(1)
+        # If still alive after 3 seconds, force kill (but log it)
+        if @log_watcher_thread.alive?
+          Rails.logger.warn "Onlylogs: Force killing watcher thread after timeout"
+          @log_watcher_thread.kill
+          @log_watcher_thread.join(1)
+        end
+      end
+
+      # Clear references to allow GC
+      @log_watcher_thread = nil
+      @log_file = nil
     end
 
     def read_entire_file_with_filter(file_path, filter = nil, regexp_mode = false, start_position = 0, end_position = nil)
@@ -146,36 +154,38 @@ module Onlylogs
 
       line_count = 0
 
-      Rails.logger.silence(Logger::ERROR) do
-        @log_file.grep(filter, regexp_mode: regexp_mode, start_position: start_position, end_position: end_position) do |log_line|
-          return if @batch_sender.nil?
+      begin
+        Rails.logger.silence(Logger::ERROR) do
+          @log_file.grep(filter, regexp_mode: regexp_mode, start_position: start_position, end_position: end_position) do |log_line|
+            return if @batch_sender.nil?
 
-          # Add to batch buffer (sender thread will handle sending)
-          @batch_sender.add_line({
-                                   line_number: log_line.number,
-                                   html: render_log_line(log_line)
-                                 })
+            # Add to batch buffer (sender thread will handle sending)
+            @batch_sender.add_line(render_log_line(log_line))
 
-          line_count += 1
+            line_count += 1
+          end
         end
-      end
 
-      # Stop batch sender and flush any remaining lines
-      @batch_sender.stop
+        # Stop batch sender and flush any remaining lines
+        @batch_sender.stop
 
-      # Send completion message
-      if line_count >= Onlylogs.max_line_matches
-        transmit({ action: "finish", content: "Search finished. Search results limit reached." })
-      else
-        transmit({ action: "finish", content: "Search finished." })
+        # Send completion message
+        if line_count >= Onlylogs.max_line_matches
+          transmit({ action: "finish", content: "Search finished. Search results limit reached." })
+        else
+          transmit({ action: "finish", content: "Search finished." })
+        end
+      ensure
+        # Always cleanup even if interrupted or error occurs
+        @batch_sender&.stop
+        @batch_sender = nil
+        @log_file = nil
+        @log_watcher_running = false
       end
-
-      @log_watcher_running = false
     end
 
     def render_log_line(log_line)
-      "<pre data-line-number=\"#{log_line.number}\">" \
-        "<span class=\"line-number\">#{log_line.parsed_number}</span>#{log_line.parsed_text}</pre>"
+      "<pre>#{FilePathParser.parse(AnsiColorParser.parse(ERB::Util.html_escape(log_line)))}</pre>"
     end
   end
 end

data/app/javascript/onlylogs/controllers/log_streamer_controller.js

@@ -5,7 +5,6 @@ export default class LogStreamerController extends Controller {
   static values = {
     filePath: { type: String },
     cursorPosition: { type: Number, default: 0 },
-    lastLineNumber: { type: Number, default: 0 },
     autoScroll: { type: Boolean, default: true },
     autoStart: { type: Boolean, default: true },
     filter: { type: String, default: '' },
@@ -13,7 +12,7 @@ export default class LogStreamerController extends Controller {
     regexpMode: { type: Boolean, default: false }
   };
 
-  static targets = ["logLines", "filterInput", "lineRange", "liveMode", "message", "regexpMode", "websocketStatus", "stopButton", "clearButton"];
+  static targets = ["logLines", "filterInput", "results", "liveMode", "message", "regexpMode", "websocketStatus", "stopButton", "clearButton"];
 
   connect() {
     this.consumer = createConsumer();
@@ -21,8 +20,6 @@ export default class LogStreamerController extends Controller {
     this.subscription = null;
     this.isRunning = false;
     this.reconnectTimeout = null;
-    this.minLineNumber = null;
-    this.maxLineNumber = 0;
     this.isSearchFinished = true;
 
     // Initialize clusterize
@@ -83,12 +80,8 @@ export default class LogStreamerController extends Controller {
   }
 
   clear() {
-    this.minLineNumber = null;
-    this.maxLineNumber = 0;
-
     this.clusterize.clear();
-
-    this.#updateLineRangeDisplay();
+    this.#updateResultsDisplay();
   }
 
   toggleAutoScroll() {
@@ -180,9 +173,8 @@ export default class LogStreamerController extends Controller {
   }
 
   stopSearch() {
-    if (this.subscription && this.isRunning) {
-      this.subscription.perform('stop_watcher');
-    }
+    console.log("stop search");
+    this.subscription.perform('stop_watcher');
   }
 
   clearLogs() {
@@ -244,7 +236,6 @@ export default class LogStreamerController extends Controller {
   #handleConnected() {
     this.subscription.perform('initialize_watcher', {
       cursor_position: this.cursorPositionValue,
-      last_line_number: this.lastLineNumberValue,
       file_path: this.filePathValue,
       filter: this.filterInputTarget.value,
       mode: this.modeValue,
@@ -273,24 +264,10 @@ export default class LogStreamerController extends Controller {
 
   #handleLogLines(lines) {
     try {
-      const newLines = [];
-
-      lines.forEach(line => {
-        const { line_number, html } = line;
-
-        if (this.minLineNumber === null || line_number < this.minLineNumber) {
-          this.minLineNumber = line_number;
-        }
-        this.maxLineNumber = Math.max(this.maxLineNumber, line_number);
-
-        // Add to new lines array for clusterize
-        newLines.push(html);
-      });
-
       // Append new lines to clusterize
-      if (newLines.length > 0) {
-        this.clusterize.append(newLines);
-        this.#updateLineRangeDisplay();
+      if (lines.length > 0) {
+        this.clusterize.append(lines);
+        this.#updateResultsDisplay();
         this.scroll();
       }
 
@@ -313,13 +290,8 @@ export default class LogStreamerController extends Controller {
   }
 
   #handleFinish(message) {
-    // Display the finish message without loading icon
     this.messageTarget.innerHTML = message;
-
-    // Mark search as finished
     this.isSearchFinished = true;
-
-    // Update stop button visibility (should hide it)
     this.updateStopButtonVisibility();
   }
 
@@ -341,19 +313,9 @@ export default class LogStreamerController extends Controller {
     this.messageTarget.innerHTML = '';
   }
 
-  #updateLineRangeDisplay() {
+  #updateResultsDisplay() {
     const resultsCount = this.clusterize.getRowsAmount();
-    let lineRangeText;
-
-    if (this.minLineNumber === null || this.maxLineNumber === 0) {
-      lineRangeText = `No lines`;
-    } else if (this.minLineNumber === this.maxLineNumber) {
-      lineRangeText = `Line ${this.#formatNumber(this.minLineNumber)}`;
-    } else {
-      lineRangeText = `Lines ${this.#formatNumber(this.minLineNumber)} - ${this.#formatNumber(this.maxLineNumber)}`;
-    }
-
-    this.lineRangeTarget.textContent = `${lineRangeText} | Results: ${this.#formatNumber(resultsCount)}`;
+    this.resultsTarget.textContent = `Results: ${this.#formatNumber(resultsCount)}`;
   }
 
   #formatNumber(number) {
@@ -393,7 +355,6 @@ export default class LogStreamerController extends Controller {
       filePath: this.filePathValue,
       cursorPosition: this.cursorPositionValue,
       lineCount: this.clusterize.getRowsAmount(),
-      maxLineNumber: this.maxLineNumber,
       connected: this.subscription && this.subscription.identifier
     };
   }

data/app/models/onlylogs/batch_sender.rb

@@ -23,14 +23,26 @@ module Onlylogs
       end
     end
 
-    def stop
+    def stop(send_remaining_lines: true)
       return unless @running
 
       @running = false
-      @sender_thread&.join(0.1)
-      
+
+      # Wait longer for graceful shutdown
+      if @sender_thread&.alive?
+        @sender_thread.join(0.5)
+      end
+
       # Send any remaining lines
       send_batch
+      if send_remaining_lines
+        send_batch
+      else
+        @mutex.synchronize { @buffer.clear }
+      end
+
+      # Clear thread reference to allow GC
+      @sender_thread = nil
     end
 
     def add_line(line_data)

data/app/models/onlylogs/file.rb

@@ -2,12 +2,11 @@ module Onlylogs
   class Error < StandardError; end
 
   class File
-    attr_reader :path, :last_position, :last_line_number
+    attr_reader :path, :last_position
 
     def initialize(path, last_position: 0)
       self.path = path
       self.last_position = last_position
-      self.last_line_number = 0
       validate!
     end
 
@@ -15,7 +14,6 @@ module Onlylogs
       return if position < 0
 
       self.last_position = position
-      self.last_line_number = 0
     end
 
     def watch(&block)
@@ -58,14 +56,14 @@ module Onlylogs
     end
 
     def grep(filter, regexp_mode: false, start_position: 0, end_position: nil, &block)
-      Grep.grep(filter, path, regexp_mode: regexp_mode, start_position: start_position, end_position: end_position) do |line_number, content|
-        yield Onlylogs::LogLine.new(line_number, content)
+      Grep.grep(filter, path, regexp_mode: regexp_mode, start_position: start_position, end_position: end_position) do |content|
+        yield content
       end
     end
 
     private
 
-    attr_writer :path, :last_position, :last_line_number
+    attr_writer :path, :last_position
 
     def read_new_lines
       return [] unless exist?
@@ -73,74 +71,32 @@ module Onlylogs
       current_size = ::File.size(path)
       return [] if current_size <= last_position
 
-      # Read new content from last_position to end of file
-      new_content = ""
+      lines = []
+
       ::File.open(path, "rb") do |file|
         file.seek(last_position)
-        new_content = file.read
-      end
-
-      return [] if new_content.empty?
 
-      # Split into lines, handling incomplete lines
-      lines = new_content.lines(chomp: true)
-
-      # If we're not at the beginning of the file, check if we're at a line boundary
-      first_line_removed = false
-      if last_position > 0
-        # Read one character before to see if it was a newline
-        ::File.open(path, "rb") do |file|
+        # Skip first line if we're mid-line (not at start or after newline)
+        if last_position > 0
           file.seek(last_position - 1)
-          char_before = file.read(1)
-          # If the character before wasn't a newline, we're in the middle of a line
-          if char_before != "\n" && lines.any?
-            # Remove the first line as it's incomplete
-            lines.shift
-            first_line_removed = true
-          end
+          skip_first = (file.read(1) != "\n")
+          file.seek(last_position)
+          file.gets if skip_first # Consume incomplete line
         end
-      end
 
-      # Check if the last line is complete (ends with newline)
-      last_line_incomplete = lines.any? && !new_content.end_with?("\n")
-      if last_line_incomplete
-        # Remove the last line as it's incomplete
-        lines.pop
-      end
-
-      # Update position to end of last complete line
-      if lines.any?
-        # Find the position after the last complete line
-        ::File.open(path, "rb") do |file|
-          file.seek(last_position)
-          # Read and count newlines to find where complete lines end
-          newline_count = 0
-          # If we removed the first line, we need to count one extra newline
-          # to account for the incomplete first line
-          target_newlines = lines.length + (first_line_removed ? 1 : 0)
-          while newline_count < target_newlines
-            char = file.read(1)
-            break unless char
-
-            newline_count += 1 if char == "\n"
+        # Read complete lines using gets (memory efficient, no buffer needed)
+        while (line = file.gets)
+          if line.end_with?("\n")
+            # Complete line - store as simple string
+            lines << line.chomp
+            self.last_position = file.pos
+          else
+            # Incomplete line at EOF - skip it
+            break
           end
-          self.last_position = file.tell
         end
-      elsif last_line_incomplete
-        # If we had lines but removed the last incomplete one,
-        # position should be at the start of the incomplete line
-        self.last_position = current_size - new_content.lines.last.length
-      elsif first_line_removed
-        # If we removed the first line but have no complete lines,
-        # position should be at the end of the file since we consumed all content
-        self.last_position = current_size
-      else
-        # No lines at all, position at end of file
-        self.last_position = current_size
       end
 
-      lines = lines.map.with_index { |line, index| Onlylogs::LogLine.new(self.last_line_number + index, line) }
-      self.last_line_number += lines.length
       lines
     end
 

data/app/models/onlylogs/grep.rb

@@ -21,16 +21,14 @@ module Onlylogs
 
       IO.popen(command_args, err: "/dev/null") do |io|
         io.each_line do |line|
-          # Parse each line as it comes in - super_grep returns grep output with line numbers (format: line_number:content)
-          if match = line.strip.match(/^(\d+):(.*)/)
-            line_number = match[1].to_i
-            content = match[2]
-
-            if block_given?
-              yield line_number, content
-            else
-              results << [ line_number, content ]
-            end
+          # Line numbers are no longer outputted by super_grep/super_ripgrep
+          # Use String.new to create a copy and prevent memory retention from IO buffers
+          content = String.new(line.chomp)
+
+          if block_given?
+            yield content
+          else
+            results << content
           end
         end
       end

data/app/views/onlylogs/shared/_log_container.html.erb

@@ -83,7 +83,7 @@
           </button>
         </div>
         <div>
-          <span data-log-streamer-target="lineRange" style="color: #666;">No lines</span>
+          <span data-log-streamer-target="results" style="color: #666;">Results: 0</span>
         </div>
         <div data-log-streamer-target="message"></div>
         <% unless Onlylogs.ripgrep_enabled? %>

data/app/views/onlylogs/shared/_log_container_styles.html.erb

@@ -26,14 +26,23 @@
 
         .clusterize-content {
             outline: 0;
+            counter-reset: line-number;
         }
 
-        .line-number {
-            color: #aaa;
-            user-select: none;
-            margin-right: 0.5em;
+        pre {
+            counter-increment: line-number;
+
+            &::before {
+                content: counter(line-number);
+                color: #aaa;
+                user-select: none;
+                margin-right: 0.5em;
+                display: inline-block;
+                text-align: right;
+                min-width: 3.5em;
+            }
         }
-        
+
         .color-success {
             color: green;
         }

data/lib/onlylogs/engine.rb

@@ -25,15 +25,5 @@ module Onlylogs
         end
       end
     end
-
-    # initializer "onlylogs.add_log_silencer" do |app|
-    #   silenced_routes = ['/onlylogs']
-    #
-    #   app.middleware.insert_before(
-    #     Rails::Rack::Logger,
-    #     Onlylogs::LogSilencerMiddleware,
-    #     paths_to_silence: silenced_routes
-    #   )
-    # end
   end
 end

data/lib/onlylogs/version.rb

@@ -1,3 +1,3 @@
 module Onlylogs
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlylogs
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Alessandro Rodi
@@ -56,12 +56,10 @@ files:
 - app/javascript/onlylogs/controllers/text_selection_controller.js
 - app/jobs/onlylogs/application_job.rb
 - app/models/onlylogs/ansi_color_parser.rb
-- app/models/onlylogs/application_record.rb
 - app/models/onlylogs/batch_sender.rb
 - app/models/onlylogs/file.rb
 - app/models/onlylogs/file_path_parser.rb
 - app/models/onlylogs/grep.rb
-- app/models/onlylogs/log_line.rb
 - app/models/onlylogs/secure_file_path.rb
 - app/views/home/show.html.erb
 - app/views/layouts/onlylogs/application.html.erb
@@ -76,7 +74,6 @@ files:
 - lib/onlylogs/configuration.rb
 - lib/onlylogs/engine.rb
 - lib/onlylogs/formatter.rb
-- lib/onlylogs/log_silencer_middleware.rb
 - lib/onlylogs/logger.rb
 - lib/onlylogs/socket_logger.rb
 - lib/onlylogs/version.rb

data/app/models/onlylogs/application_record.rb

@@ -1,5 +0,0 @@
-module Onlylogs
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end

data/app/models/onlylogs/log_line.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Onlylogs
-  class LogLine
-    attr_reader :number, :text
-
-    def initialize(number, text)
-      @number = number
-      @text = text
-    end
-
-    def parsed_number
-      number.to_s.reverse.gsub(/(\d{3})(?=\d)/, "\\1'").reverse.rjust(7)
-    end
-
-    def parsed_text
-      FilePathParser.parse(AnsiColorParser.parse(ERB::Util.html_escape(text)))
-    end
-
-    def to_a
-      [number, text]
-    end
-  end
-end

data/lib/onlylogs/log_silencer_middleware.rb

@@ -1,26 +0,0 @@
-module Onlylogs
-  class LogSilencerMiddleware
-    def initialize(app, paths_to_silence:)
-      @app = app
-      # Ensure paths are an array for flexibility
-      @paths_to_silence = Array(paths_to_silence)
-    end
-
-    def call(env)
-      if silence_request?(env)
-        Rails.logger.silence do
-          @app.call(env)
-        end
-      else
-        @app.call(env)
-      end
-    end
-
-    private
-
-    def silence_request?(env)
-      request_path = env['PATH_INFO']
-      @paths_to_silence.any? { |path| request_path.start_with?(path) }
-    end
-  end
-end