onlylogs 0.5.2 → 0.7.0

data/lib/onlylogs/socket_logger.rb

@@ -1,73 +1,27 @@
 # frozen_string_literal: true
 
-require "socket"
-
-# 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.
-
+require_relative "socket_device"
+require_relative "multi_device"
+
+# Logs to $stdout (local fallback) and to onlylogs.io via a UNIX socket connected to the onlylogs
+# sidecar process. You need to have the onlylogs sidecar running for the socket sink to work.
+#
+# This is a plain Onlylogs::Logger whose log device is the sidecar socket teed with the local
+# fallback. It deliberately does NOT override #add: the stock Logger#add applies the level and
+# formats each line before writing, so a below-level line reaches neither sink.
 module Onlylogs
   class SocketLogger < Onlylogs::Logger
-    DEFAULT_SOCKET = "tmp/sockets/onlylogs-sidecar.sock"
-
-    def initialize(local_fallback: $stdout, socket_path: ENV.fetch("ONLYLOGS_SIDECAR_SOCKET", DEFAULT_SOCKET))
-      super(local_fallback)
-      @socket_path = socket_path
-      @socket_mutex = Mutex.new
-      @socket = nil
-    end
-
-    def add(severity, message = nil, progname = nil, &block)
-      if message.nil?
-        if block_given?
-          message = block.call
-        else
-          message = progname
-          progname = nil
-        end
-      end
-
-      formatted = format_message(format_severity(severity), Time.now, progname, message.to_s)
-      send_to_socket(formatted)
-      super
-    end
-
-    private
-
-    def send_to_socket(payload)
-      return if payload.nil? || payload.empty?
-
-      socket = ensure_socket
-      socket&.puts(payload)
-    rescue Errno::EPIPE, Errno::ECONNREFUSED, Errno::ENOENT => e
-      $stderr.puts "Onlylogs::SocketLogger error: #{e.message}" # rubocop:disable Style/StderrPuts
-      reconnect_socket
-    rescue => e
-      $stderr.puts "Onlylogs::SocketLogger unexpected error: #{e.class}: #{e.message}" # rubocop:disable Style/StderrPuts
-      reconnect_socket
-    end
-
-    def ensure_socket
-      return @socket if @socket
-
-      @socket_mutex.synchronize do
-        @socket ||= UNIXSocket.new(@socket_path)
-      rescue => e
-        $stderr.puts "Unable to connect to Onlylogs sidecar (#{@socket_path}): #{e.message}" # rubocop:disable Style/StderrPuts
-        @socket = nil
-      end
+    attr_reader :device
 
-      @socket
+    def initialize(local_fallback: $stdout, socket_path: ENV.fetch("ONLYLOGS_SIDECAR_SOCKET", SocketDevice::DEFAULT_SOCKET))
+      @device = SocketDevice.new(socket_path: socket_path)
+      super(MultiDevice.new(local_fallback, @device))
     end
 
-    def reconnect_socket
-      @socket_mutex.synchronize do
-        begin
-          @socket&.close
-        rescue
-          nil
-        end
-        @socket = nil
-      end
+    # Only the remote socket is ours to close; the local fallback ($stdout) belongs to the app, so
+    # we deliberately do not call super (which would close the whole log device, fallback included).
+    def close
+      @device.close
     end
   end
 end

data/lib/onlylogs/spool.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require "securerandom"
+
+module Onlylogs
+  # A bounded, on-disk overflow buffer for log batches that could not be delivered.
+  #
+  # HttpLogger keeps the happy path in memory: only when a send fails or the circuit is open does
+  # a batch get written here, to be replayed once the drain recovers (and on the next boot).
+  # This turns transient-failure / restart data loss into at-least-once delivery: a batch that was in
+  # fact received but whose response was lost will be replayed and show up as a duplicate
+  # downstream. Duplicates are an accepted trade for not losing data.
+  class Spool
+    DEFAULT_MAX_BYTES = 128 * 1024 * 1024 # 128 MB
+
+    def initialize(dir:, max_bytes: DEFAULT_MAX_BYTES)
+      @dir = dir
+      @max_bytes = max_bytes
+      # Unique per instance so two runs (even with a reused pid) never collide on a filename.
+      @token = SecureRandom.hex(4)
+      @seq = 0
+      @mutex = Mutex.new
+      ::FileUtils.mkdir_p(@dir)
+    end
+
+    # Persist a batch body. Rolls the oldest batches off first if the byte cap would be exceeded.
+    def write(body)
+      return if body.nil? || body.empty?
+
+      @mutex.synchronize do
+        evict(body.bytesize)
+        seq = (@seq += 1)
+        final = ::File.join(@dir, "#{@token}-#{format("%09d", seq)}.batch")
+        tmp = "#{final}.tmp"
+        # Write to a temp name then rename: rename is atomic, so replay never reads a
+        # half-written file (it only globs *.batch).
+        ::File.binwrite(tmp, body)
+        ::File.rename(tmp, final)
+      end
+    rescue => e
+      Kernel.warn "Onlylogs::Spool write error: #{e.class}: #{e.message}"
+    end
+
+    # Replay pending batches oldest-first. Yields each body; if the block returns truthy the file
+    # is deleted (delivered), otherwise replay stops and the remaining files are kept for later.
+    def replay
+      pending_files.each do |path|
+        body = read(path)
+        next if body.nil? # already claimed/deleted by another process
+
+        break unless yield(body)
+
+        delete(path)
+      end
+    end
+
+    def empty?
+      pending_files.empty?
+    end
+
+    private
+
+    # Oldest-first. mtime is the primary key; the zero-padded sequence in the filename breaks
+    # ties (and preserves per-process write order when mtimes collide at coarse FS resolution).
+    def pending_files
+      ::Dir.glob(::File.join(@dir, "*.batch")).sort_by { |path| [mtime(path), path] }
+    end
+
+    def mtime(path)
+      ::File.mtime(path)
+    rescue Errno::ENOENT
+      Time.at(0)
+    end
+
+    def read(path)
+      ::File.binread(path)
+    rescue Errno::ENOENT
+      nil
+    end
+
+    def delete(path)
+      ::File.delete(path)
+    rescue Errno::ENOENT
+      nil
+    end
+
+    # Delete oldest batches until `incoming` more bytes fit under the cap.
+    def evict(incoming)
+      files = pending_files
+      total = files.sum { |path| size(path) }
+
+      while total + incoming > @max_bytes && (oldest = files.shift)
+        total -= size(oldest)
+        delete(oldest)
+      end
+    end
+
+    def size(path)
+      ::File.size(path)
+    rescue Errno::ENOENT
+      0
+    end
+  end
+end

data/lib/onlylogs/version.rb

@@ -1,3 +1,3 @@
 module Onlylogs
-  VERSION = "0.5.2"
+  VERSION = "0.7.0"
 end

data/lib/onlylogs.rb

@@ -3,6 +3,10 @@ require "onlylogs/configuration"
 require "onlylogs/engine"
 require "onlylogs/formatter"
 require "onlylogs/logger"
+require "onlylogs/spool"
+require "onlylogs/multi_device"
+require "onlylogs/socket_device"
+require "onlylogs/http_device"
 require "onlylogs/socket_logger"
 require "onlylogs/http_logger"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlylogs
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Alessandro Rodi
@@ -45,6 +45,8 @@ files:
 - app/assets/images/onlylogs/favicon/web-app-manifest-192x192.png
 - app/assets/images/onlylogs/favicon/web-app-manifest-512x512.png
 - app/assets/images/onlylogs/logo.png
+- app/assets/javascripts/onlylogs/clusterize.js
+- app/assets/stylesheets/onlylogs/clusterize.css
 - app/channels/onlylogs/application_cable/channel.rb
 - app/channels/onlylogs/logs_channel.rb
 - app/controllers/onlylogs/application_controller.rb
@@ -69,6 +71,7 @@ files:
 - app/views/onlylogs/logs/index.html.erb
 - app/views/onlylogs/shared/_log_container.html.erb
 - app/views/onlylogs/shared/_log_container_styles.html.erb
+- app/views/onlylogs/shared/_range_slider.html.erb
 - bin/onlylogs_sidecar
 - bin/super_grep
 - bin/super_ripgrep
@@ -79,9 +82,13 @@ files:
 - lib/onlylogs/configuration.rb
 - lib/onlylogs/engine.rb
 - lib/onlylogs/formatter.rb
+- lib/onlylogs/http_device.rb
 - lib/onlylogs/http_logger.rb
 - lib/onlylogs/logger.rb
+- lib/onlylogs/multi_device.rb
+- lib/onlylogs/socket_device.rb
 - lib/onlylogs/socket_logger.rb
+- lib/onlylogs/spool.rb
 - lib/onlylogs/version.rb
 - lib/puma/plugin/onlylogs_sidecar.rb
 - lib/tasks/onlylogs_tasks.rake