onlylogs 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e2bc76a652e2bc255ff847d0516783dace7aedead98ee7e4a2bf6d9cbf7fe1
-  data.tar.gz: 95cf2efa8b9e94a9a36a5188968e40846e010eedaab5e300275a61028d7a11f0
+  metadata.gz: 37909543bef9f932a762a08b53c0dfbebe9094f41e96d0de8740e1e1b4b66614
+  data.tar.gz: 1abced159b2385cd445b05196a6ac47801aeeaac96c8062729251aaf778733bd
 SHA512:
-  metadata.gz: 614d6037f2142d40ee178cc6b86c100105554b78607642e1e18e5374c15524445ff11119321b5dc79b901c54a472287d37daebfd625e3838216b59077b9d75d4
-  data.tar.gz: 9762dd06e5fa36068288651de814103a949e4989e10c7dd6352258bea056bb63b1605d4e05d40f549747bd287304210a8f8836de0086b32b9448012279b7ddb5
+  metadata.gz: 4def45bcdb6d9c301f3cb2d65de39f2e27247a4ae5fd7835325e8f80781279ce7ed5ac280fea95cf7d61af2d9713fae008485f9e702f4ab747a151712340bf56
+  data.tar.gz: 74e0fa68229359024780f850dd2df95ab1d930b6a949ec85b63f20d7e8ff1253e79da81f384bb6057d588b10d67764dbaa7761db1212051c8e69c2841a8dce89

data/README.md

@@ -174,7 +174,7 @@ You can configure which files onlylogs is allowed to access by creating a config
 ```ruby
 # config/initializers/onlylogs.rb
 Onlylogs.configure do |config|
-  config.allowed_files = [
+  config.log_file_patterns = [
     # Default Rails log files
     Rails.root.join("log/development.log"),
     Rails.root.join("log/production.log"),
@@ -206,7 +206,7 @@ Onlylogs supports glob patterns to allow multiple files at once:
 ```ruby
 # config/initializers/onlylogs.rb
 Onlylogs.configure do |config|
-  config.allowed_files = [
+  config.log_file_patterns = [
     # Allow all .log files in the log directory
     Rails.root.join("log/*.log"),
     

data/app/channels/onlylogs/logs_channel.rb

@@ -18,9 +18,9 @@ module Onlylogs
           file_path = Onlylogs::SecureFilePath.decrypt(encrypted_file_path)
 
           # Verify the decrypted path is still allowed
-          unless Onlylogs.allowed_file_path?(file_path)
+          unless Onlylogs.file_path_permitted?(file_path)
             Rails.logger.error "Onlylogs: Attempted to access non-allowed file: #{file_path}"
-            transmit({ action: "error", content: "Access denied" })
+            transmit({action: "error", content: "Access denied"})
             return
           end
         else
@@ -29,13 +29,13 @@ module Onlylogs
         end
       rescue Onlylogs::SecureFilePath::SecurityError => e
         Rails.logger.error "Onlylogs: Security violation - #{e.message}"
-        transmit({ action: "error", content: "Access denied" })
+        transmit({action: "error", content: "Access denied"})
         return
       end
 
       # Check if the file is a text file
       unless Onlylogs::File.text_file?(file_path)
-        transmit({ action: "error", content: "Cannot read file: File is not a text file" })
+        transmit({action: "error", content: "Cannot read file: File is not a text file"})
         return
       end
 
@@ -57,7 +57,7 @@ module Onlylogs
 
     def stop_watcher
       cleanup_existing_operations
-      transmit({ action: "finish", content: "Search stopped." })
+      transmit({action: "finish", content: "Search stopped."})
     end
 
     def unsubscribed
@@ -82,11 +82,11 @@ module Onlylogs
       @filter = filter
       @regexp_mode = regexp_mode
 
-      transmit({ action: "message", content: "Reading file. Please wait..." })
+      transmit({action: "message", content: "Reading file. Please wait..."})
 
       @log_file = Onlylogs::File.new(file_path, last_position: cursor_position)
 
-      transmit({ action: "message", content: "" })
+      transmit({action: "message", content: ""})
 
       @log_watcher_thread = Thread.new do
         Rails.logger.silence(Logger::ERROR) do
@@ -107,13 +107,13 @@ module Onlylogs
 
             if lines_to_send.any?
               transmit({
-                         action: "append_logs",
-                         lines: lines_to_send
-                       })
+                action: "append_logs",
+                lines: lines_to_send
+              })
             end
           end
         end
-      rescue StandardError => e
+      rescue => e
         Rails.logger.error "Log watcher error: #{e.message}"
         Rails.logger.error e.backtrace.join("\n")
       ensure
@@ -147,7 +147,7 @@ module Onlylogs
       @log_watcher_running = true
       @log_file = Onlylogs::File.new(file_path, last_position: 0)
 
-      transmit({ action: "message", content: "Searching..." })
+      transmit({action: "message", content: "Searching..."})
 
       @batch_sender = BatchSender.new(self)
       @batch_sender.start
@@ -157,7 +157,7 @@ module Onlylogs
       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?
+            break if @batch_sender.nil?
 
             # Add to batch buffer (sender thread will handle sending)
             @batch_sender.add_line(render_log_line(log_line))
@@ -171,9 +171,9 @@ module Onlylogs
 
         # Send completion message
         if line_count >= Onlylogs.max_line_matches
-          transmit({ action: "finish", content: "Search finished. Search results limit reached." })
+          transmit({action: "finish", content: "Search finished. Search results limit reached."})
         else
-          transmit({ action: "finish", content: "Search finished." })
+          transmit({action: "finish", content: "Search finished."})
         end
       ensure
         # Always cleanup even if interrupted or error occurs

data/app/controllers/onlylogs/application_controller.rb

@@ -1,5 +1,5 @@
 module Onlylogs
-  class ApplicationController < (Onlylogs.parent_controller&.constantize || ActionController::Base)
+  class ApplicationController < Onlylogs.parent_controller&.constantize || ActionController::Base
     before_action :authenticate_onlylogs_user!
 
     private

data/app/controllers/onlylogs/logs_controller.rb

@@ -5,8 +5,8 @@ module Onlylogs
     def index
       @max_lines = (params[:max_lines] || 100).to_i
 
-      # Get the file path from params or use default
-      @log_file_path = params[:log_file_path] || default_log_file_path
+      @available_log_files = Onlylogs.available_log_files
+      @log_file_path = selected_log_file_path
 
       @filter = params[:filter]
       @autoscroll = params[:autoscroll] != "false"
@@ -15,9 +15,24 @@ module Onlylogs
 
     private
 
+    def selected_log_file_path
+      encrypted_path = params[:log_file_path]
+      return default_log_file_path if encrypted_path.blank?
+
+      decrypted_path = Onlylogs::SecureFilePath.decrypt(encrypted_path)
+      if Onlylogs.file_path_permitted?(decrypted_path)
+        decrypted_path
+      else
+        raise SecurityError, "File path not allowed"
+      end
+    end
+
     def default_log_file_path
       # "/Users/alessandrorodi/RenuoWorkspace/onlylogs/test/fixtures/files/very_big.log"
-      Onlylogs.default_log_file_path
+      configured_default = Onlylogs.default_log_file_path
+      return configured_default if Onlylogs.file_path_permitted?(configured_default) && ::File.exist?(configured_default)
+
+      @available_log_files.first&.to_s || configured_default
     end
   end
 end

data/app/models/onlylogs/ansi_color_parser.rb

@@ -17,25 +17,25 @@ module Onlylogs
     }.freeze
 
     # Pre-compiled regex for better performance
-    ANSI_REGEX = /\x1b\[(\d+)m/.freeze
+    ANSI_REGEX = /\x1b\[(\d+)m/
 
     # Pre-built HTML templates to avoid string interpolation (frozen for better performance)
     HTML_TEMPLATES = {
-      "1" => '<span class="fw-bold">'.freeze,
-      "30" => '<span class="log-black">'.freeze,
-      "31" => '<span class="log-red">'.freeze,
-      "32" => '<span class="log-green">'.freeze,
-      "33" => '<span class="log-yellow">'.freeze,
-      "34" => '<span class="log-blue">'.freeze,
-      "35" => '<span class="log-magenta">'.freeze,
-      "36" => '<span class="log-cyan">'.freeze,
-      "37" => '<span class="log-white">'.freeze,
-      "39" => '<span class="">'.freeze,
-      "0" => "".freeze # Reset (no color)
+      "1" => '<span class="fw-bold">',
+      "30" => '<span class="log-black">',
+      "31" => '<span class="log-red">',
+      "32" => '<span class="log-green">',
+      "33" => '<span class="log-yellow">',
+      "34" => '<span class="log-blue">',
+      "35" => '<span class="log-magenta">',
+      "36" => '<span class="log-cyan">',
+      "37" => '<span class="log-white">',
+      "39" => '<span class="">',
+      "0" => "" # Reset (no color)
     }.freeze
 
     # Pre-built closing span (frozen for better performance)
-    CLOSING_SPAN = "</span>".freeze
+    CLOSING_SPAN = "</span>"
 
     def self.parse(string)
       return string if string.blank?

data/app/models/onlylogs/file_path_parser.rb

@@ -6,29 +6,29 @@ require "uri"
 module Onlylogs
   class FilePathParser
     KNOWN_EDITORS = [
-      { symbols: [ :atom ], sniff: /atom/i, url: "atom://core/open/file?filename=%{file}&line=%{line}" },
-      { symbols: [ :emacs, :emacsclient ], sniff: /emacs/i, url: "emacs://open?url=file://%{file}&line=%{line}" },
-      { symbols: [ :idea ], sniff: /idea/i, url: "idea://open?file=%{file}&line=%{line}" },
-      { symbols: [ :macvim, :mvim, :vim ], sniff: /vim/i, url: "mvim://open?url=file://%{file_unencoded}&line=%{line}" },
-      { symbols: [ :rubymine, :mine ], sniff: /mine/i, url: "x-mine://open?file=%{file}&line=%{line}" },
-      { symbols: [ :sublime, :subl, :st ], sniff: /subl/i, url: "subl://open?url=file://%{file}&line=%{line}" },
-      { symbols: [ :textmate, :txmt, :tm, :mate ], sniff: /mate/i, url: "txmt://open?url=file://%{file}&line=%{line}" },
-      { symbols: [ :vscode, :code ], sniff: /code/i, url: "vscode://file/%{file}:%{line}" },
-      { symbols: [ :vscodium, :codium ], sniff: /codium/i, url: "vscodium://file/%{file}:%{line}" }
+      {symbols: [:atom], sniff: /atom/i, url: "atom://core/open/file?filename=%{file}&line=%{line}"},
+      {symbols: [:emacs, :emacsclient], sniff: /emacs/i, url: "emacs://open?url=file://%{file}&line=%{line}"},
+      {symbols: [:idea], sniff: /idea/i, url: "idea://open?file=%{file}&line=%{line}"},
+      {symbols: [:macvim, :mvim, :vim], sniff: /vim/i, url: "mvim://open?url=file://%{file_unencoded}&line=%{line}"},
+      {symbols: [:rubymine, :mine], sniff: /mine/i, url: "x-mine://open?file=%{file}&line=%{line}"},
+      {symbols: [:sublime, :subl, :st], sniff: /subl/i, url: "subl://open?url=file://%{file}&line=%{line}"},
+      {symbols: [:textmate, :txmt, :tm, :mate], sniff: /mate/i, url: "txmt://open?url=file://%{file}&line=%{line}"},
+      {symbols: [:vscode, :code], sniff: /code/i, url: "vscode://file/%{file}:%{line}"},
+      {symbols: [:vscodium, :codium], sniff: /codium/i, url: "vscodium://file/%{file}:%{line}"}
     ].freeze
 
     # Pre-compiled regex for better performance
     FILE_PATH_PATTERN = %r{
       (?<![a-zA-Z0-9_/])  # Negative lookbehind - not preceded by word chars or /
       (?:\./)?             # Optional relative path indicator
-      (?:/[a-zA-Z0-9_\-\.\s]+)+  # File path with allowed characters
+      (?:/[a-zA-Z0-9_\-.\s]+)+  # File path with allowed characters
       (?:\.rb|\.js|\.ts|\.tsx|\.jsx|\.py|\.java|\.go|\.rs|\.php|\.html|\.erb|\.haml|\.slim|\.css|\.scss|\.sass|\.less|\.xml|\.json|\.yml|\.yaml|\.md|\.txt|\.log)  # File extensions
       (?::\d+)?            # Optional line number
       (?![a-zA-Z0-9_/])    # Negative lookahead - not followed by word chars or /
-    }x.freeze
+    }x
 
     # Pre-built HTML template to avoid string interpolation
-    HTML_TEMPLATE = '<a href="%{url}" class="file-link">%{match}</a>'.freeze
+    HTML_TEMPLATE = '<a href="%{url}" class="file-link">%{match}</a>'
 
     def self.parse(string)
       return string if string.blank?
@@ -40,7 +40,7 @@ module Onlylogs
         file_path = extract_file_path(match)
         line_number = extract_line_number(match)
         url = cached_editor_instance.url(file_path, line_number)
-        HTML_TEMPLATE % { url: url, match: match }
+        HTML_TEMPLATE % {url: url, match: match}
       end
     end
 
@@ -73,7 +73,6 @@ module Onlylogs
       end
     end
 
-
     def self.editor_from_symbol(symbol)
       KNOWN_EDITORS.each do |preset|
         return for_formatting_string(preset[:url]) if preset[:symbols].include?(symbol)
@@ -86,14 +85,14 @@ module Onlylogs
     end
 
     def url(raw_path, line)
-      if virtual_path && raw_path.start_with?(virtual_path)
+      file = if virtual_path && raw_path.start_with?(virtual_path)
         if host_path
-          file = raw_path.sub(%r{\A#{virtual_path}}, host_path)
+          raw_path.sub(%r{\A#{virtual_path}}, host_path)
         else
-          file = raw_path.sub(%r{\A#{virtual_path}/}, "")
+          raw_path.sub(%r{\A#{virtual_path}/}, "")
         end
       else
-        file = raw_path
+        raw_path
       end
 
       url_proc.call(file, line)
@@ -115,15 +114,19 @@ module Onlylogs
       @host_path ||= ENV["ONLYLOGS_HOST_PATH"]
     end
 
-    def self.extract_file_path(match)
-      # Remove line number if present
-      match.sub(/:\d+$/, "")
-    end
+    class << self
+      private
 
-    def self.extract_line_number(match)
-      # Extract line number or default to 1
-      line_match = match.match(/:(\d+)$/)
-      line_match ? line_match[1].to_i : 1
+      def extract_file_path(match)
+        # Remove line number if present
+        match.sub(/:\d+$/, "")
+      end
+
+      def extract_line_number(match)
+        # Extract line number or default to 1
+        line_match = match.match(/:(\d+)$/)
+        line_match ? line_match[1].to_i : 1
+      end
     end
   end
 end

data/app/models/onlylogs/grep.rb

@@ -5,8 +5,8 @@ module Onlylogs
       script_name = Onlylogs.ripgrep_enabled? ? "super_ripgrep" : "super_grep"
       super_grep_path = ::File.expand_path("../../../bin/#{script_name}", __dir__)
 
-      command_args = [ super_grep_path ]
-      command_args += [ "--max-matches", Onlylogs.max_line_matches.to_s ] if Onlylogs.max_line_matches.present?
+      command_args = [super_grep_path]
+      command_args += ["--max-matches", Onlylogs.max_line_matches.to_s] if Onlylogs.max_line_matches.present?
       command_args << "--regexp" if regexp_mode
 
       # Add byte range parameters if specified
@@ -15,7 +15,7 @@ module Onlylogs
         command_args << "--end-position" << end_position.to_s if end_position
       end
 
-      command_args += [ pattern, file_path ]
+      command_args += [pattern, file_path]
 
       results = []
 

data/app/models/onlylogs/secure_file_path.rb

@@ -22,9 +22,7 @@ module Onlylogs
       raise SecurityError, "Invalid encrypted file path"
     end
 
-    private
-
-    def self.encryption_key
+    private_class_method def self.encryption_key
       Rails.application.secret_key_base[0..31]
     end
   end

data/app/views/onlylogs/logs/index.html.erb

@@ -1 +1,41 @@
-<%= render partial: "onlylogs/shared/log_container", locals: { log_file_path: @log_file_path, tail: @max_lines, filter: @filter, autoscroll: @autoscroll } %>
+<style>
+    .grid {
+        display: grid;
+        grid-template-rows: 32px 1fr;
+        height: 100vh;
+    }
+
+    .grid-header {
+        display: flex;
+        align-items: center;
+        border-bottom: 1px solid lightgray;
+    }
+
+    .logo {
+        height: 20px;
+        margin: 3px;
+    }
+
+    .log-file-dropdown {
+        margin-left: 0.5rem;
+    }
+</style>
+<div class="grid">
+  <div class="grid-header">
+    <%= image_tag "onlylogs/logo.png", class: "logo" %>
+    <% if @available_log_files.any? %>
+      <%= form_with url: root_path, method: :get, local: true, class: "log-file-dropdown" do %>
+        <select id="log_file_path" name="log_file_path" onchange="this.form.submit()">
+          <% @available_log_files.each do |file| %>
+            <% encrypted_path = Onlylogs::SecureFilePath.encrypt(file.to_s) %>
+            <% relative_path = Pathname.new(file).relative_path_from(Rails.root).to_s %>
+            <option value="<%= encrypted_path %>" <%= "selected" if file.to_s == @log_file_path.to_s %>>
+              <%= relative_path %>
+            </option>
+          <% end %>
+        </select>
+      <% end %>
+    <% end %>
+  </div>
+  <%= render partial: "onlylogs/shared/log_container", locals: { log_file_path: @log_file_path, tail: @max_lines, filter: @filter, autoscroll: @autoscroll } %>
+</div>

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

@@ -7,7 +7,7 @@
     mode = filter.blank? ? "live" : "search"
     cursor_position = mode == "search" ? 0 : [File.size(log_file_path) - (tail * 100), 0].max
 
-    raise SecurityError, "File path not allowed" unless Onlylogs.allowed_file_path?(log_file_path)
+    raise SecurityError, "File path not allowed" unless Onlylogs.file_path_permitted?(log_file_path)
 
     encrypted_log_file_path = Onlylogs::SecureFilePath.encrypt(log_file_path)
 %>

data/config/routes.rb

@@ -1,4 +1,4 @@
 Onlylogs::Engine.routes.draw do
   root "logs#index"
-  resources :logs, only: [ :index ]
+  resources :logs, only: [:index]
 end

data/lib/onlylogs/configuration.rb

@@ -2,12 +2,12 @@
 
 module Onlylogs
   class Configuration
-    attr_accessor :allowed_files, :default_log_file_path, :basic_auth_user, :basic_auth_password,
-                  :parent_controller, :disable_basic_authentication, :ripgrep_enabled, :editor,
-                  :max_line_matches
+    attr_accessor :log_file_patterns, :default_log_file_path, :basic_auth_user, :basic_auth_password,
+      :parent_controller, :disable_basic_authentication, :ripgrep_enabled, :editor,
+      :max_line_matches
 
     def initialize
-      @allowed_files = default_allowed_files
+      @log_file_patterns = default_log_file_patterns
       @default_log_file_path = default_log_file_path_value
       @basic_auth_user = default_basic_auth_user
       @basic_auth_password = default_basic_auth_password
@@ -44,7 +44,7 @@ module Onlylogs
       :vscode
     end
 
-    def default_allowed_files
+    def default_log_file_patterns
       # Default to environment-specific log files (without rotation suffixes)
       [
         Rails.root.join("log/#{Rails.env}.log")
@@ -76,13 +76,33 @@ module Onlylogs
     yield configuration
   end
 
-  def self.allowed_file_path?(file_path)
+  def self.file_path_permitted?(file_path)
     path = ::File.expand_path(file_path.to_s)
 
-    configuration.allowed_files.any? do |pattern|
-      pat = ::File.expand_path(pattern.to_s)
-      ::File.fnmatch?(pat, path, ::File::FNM_PATHNAME | ::File::FNM_DOTMATCH)
+    configuration.log_file_patterns.any? do |pattern|
+      allowed_file_patterns_for(pattern).any? do |pat|
+        ::File.fnmatch?(pat, path, ::File::FNM_PATHNAME | ::File::FNM_DOTMATCH)
+      end
+    end
+  end
+
+  # Returns all existing files on disk that match the configured allowed_files patterns.
+  # Supports direct file paths and glob patterns (e.g., *.log, **/*.log).
+  # Returns Pathname objects so callers can access both the basename and the absolute path.
+  def self.available_log_files
+    patterns = Array(configuration.log_file_patterns)
+
+    paths = patterns.flat_map do |pattern|
+      allowed_file_patterns_for(pattern).flat_map do |expanded_pattern|
+        if glob_pattern?(expanded_pattern)
+          Dir.glob(expanded_pattern, ::File::FNM_DOTMATCH | ::File::FNM_PATHNAME).select { |p| ::File.file?(p) }
+        else
+          ::File.file?(expanded_pattern) ? [expanded_pattern] : []
+        end
+      end
     end
+
+    paths.uniq.sort.map { |p| Pathname.new(p) }
   end
 
   def self.default_log_file_path
@@ -126,4 +146,23 @@ module Onlylogs
   def self.max_line_matches
     configuration.max_line_matches
   end
+
+  def self.allowed_file_patterns_for(pattern)
+    absolute_pattern = ::File.expand_path(pattern.to_s)
+    if glob_pattern?(absolute_pattern)
+      return [absolute_pattern, "#{absolute_pattern}.*"] if absolute_pattern.end_with?(".log")
+
+      return [absolute_pattern]
+    end
+
+    return [absolute_pattern, "#{absolute_pattern}.*"] if absolute_pattern.end_with?(".log")
+
+    [absolute_pattern]
+  end
+
+  def self.glob_pattern?(pattern)
+    pattern.match?(/[*?\[\]{}]/)
+  end
+
+  private_class_method :allowed_file_patterns_for, :glob_pattern?
 end

data/lib/onlylogs/engine.rb

@@ -15,7 +15,7 @@ module Onlylogs
       end
 
       app.config.assets.paths << root.join("app/javascript")
-      app.config.assets.precompile += %w[ onlylogs_manifest ]
+      app.config.assets.precompile += %w[onlylogs_manifest]
     end
 
     if defined?(Importmap)

data/lib/onlylogs/formatter.rb

@@ -12,7 +12,7 @@ module Onlylogs
     def call(severity, time, progname, msg)
       return nil if "Onlylogs::LogsChannel".in?(msg)
       return nil if denylist.any? { |pattern| pattern.match?(msg) }
-      tags = [ time.iso8601, severity[0].upcase ]
+      tags = [time.iso8601, severity[0].upcase]
       push_tags tags
       str = super
       pop_tags tags.size

data/lib/onlylogs/socket_logger.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "socket"
-require "thread"
 
 # This logger sends messages to onlylogs.io via a UNIX socket connected to the onlylogs sidecar process.
 # You need to have the onlylogs sidecar running for this to work.
@@ -29,7 +28,7 @@ module Onlylogs
 
       formatted = format_message(format_severity(severity), Time.now, progname, message.to_s)
       send_to_socket(formatted)
-      super(severity, message, progname, &block)
+      super
     end
 
     private
@@ -40,10 +39,10 @@ module Onlylogs
       socket = ensure_socket
       socket&.puts(payload)
     rescue Errno::EPIPE, Errno::ECONNREFUSED, Errno::ENOENT => e
-      $stderr.puts "Onlylogs::SocketLogger error: #{e.message}"
+      warn "Onlylogs::SocketLogger error: #{e.message}"
       reconnect_socket
     rescue => e
-      $stderr.puts "Onlylogs::SocketLogger unexpected error: #{e.class}: #{e.message}"
+      warn "Onlylogs::SocketLogger unexpected error: #{e.class}: #{e.message}"
       reconnect_socket
     end
 
@@ -53,7 +52,7 @@ module Onlylogs
       @socket_mutex.synchronize do
         @socket ||= UNIXSocket.new(@socket_path)
       rescue => e
-        $stderr.puts "Unable to connect to Onlylogs sidecar (#{@socket_path}): #{e.message}"
+        warn "Unable to connect to Onlylogs sidecar (#{@socket_path}): #{e.message}"
         @socket = nil
       end
 
@@ -62,7 +61,11 @@ module Onlylogs
 
     def reconnect_socket
       @socket_mutex.synchronize do
-        @socket&.close rescue nil
+        begin
+          @socket&.close
+        rescue
+          nil
+        end
         @socket = nil
       end
     end

data/lib/onlylogs/version.rb

@@ -1,3 +1,3 @@
 module Onlylogs
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/puma/plugin/onlylogs_sidecar.rb

@@ -26,12 +26,12 @@ Puma::Plugin.create do
     FileUtils.mkdir_p(sockets_dir)
 
     @socket_path = env_or_option("ONLYLOGS_SIDECAR_SOCKET", :onlylogs_socket,
-                                 File.join(sockets_dir, "onlylogs-sidecar.sock"))
+      File.join(sockets_dir, "onlylogs-sidecar.sock"))
     @drain_url = ENV["ONLYLOGS_DRAIN_URL"] || @options[:onlylogs_drain_url]
     @batch_size = env_or_option("ONLYLOGS_BATCH_SIZE", :onlylogs_batch_size, 100).to_i
     @flush_interval = env_or_option("ONLYLOGS_FLUSH_INTERVAL", :onlylogs_flush_interval, 0.5).to_f
     @sidecar_script = env_or_option("ONLYLOGS_SIDECAR_BIN", :onlylogs_sidecar_bin,
-                                    File.expand_path("../../../bin/onlylogs_sidecar", __dir__))
+      File.expand_path("../../../bin/onlylogs_sidecar", __dir__))
   end
 
   def register_hooks
@@ -63,8 +63,8 @@ Puma::Plugin.create do
 
     info "Starting Onlylogs sidecar (socket: #{@socket_path}, drain: #{@drain_url})"
     @sidecar_pid = Process.spawn(env, RbConfig.ruby, @sidecar_script,
-                                 chdir: @app_root,
-                                 pgroup: true)
+      chdir: @app_root,
+      pgroup: true)
   rescue Errno::ENOENT => e
     error "Unable to start sidecar: #{e.message}"
   end
@@ -85,7 +85,11 @@ Puma::Plugin.create do
     # Already stopped
   rescue Timeout::Error
     warn "Sidecar did not stop in time, killing"
-    Process.kill("KILL", -pgid) rescue nil
+    begin
+      Process.kill("KILL", -pgid)
+    rescue
+      nil
+    end
   ensure
     @sidecar_pid = nil
     remove_socket_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlylogs
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Alessandro Rodi