onlylogs 0.5.3 → 0.7.0

data/lib/onlylogs/socket_device.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "socket"
+
+module Onlylogs
+  # Send failures are reported to $stderr — never through a logger — so a failing socket can never
+  # re-enter logging and deadlock or loop.
+  class SocketDevice
+    DEFAULT_SOCKET = "tmp/sockets/onlylogs-sidecar.sock"
+
+    def initialize(socket_path: ENV.fetch("ONLYLOGS_SIDECAR_SOCKET", DEFAULT_SOCKET))
+      @socket_path = socket_path
+      @socket_mutex = Mutex.new
+      @socket = nil
+    end
+
+    def write(message)
+      return if message.nil? || message.empty?
+
+      socket = ensure_socket
+      socket&.puts(message)
+    rescue Errno::EPIPE, Errno::ECONNREFUSED, Errno::ENOENT => e
+      $stderr.puts "Onlylogs::SocketDevice error: #{e.message}" # rubocop:disable Style/StderrPuts
+      reconnect_socket
+    rescue => e
+      $stderr.puts "Onlylogs::SocketDevice unexpected error: #{e.class}: #{e.message}" # rubocop:disable Style/StderrPuts
+      reconnect_socket
+    end
+
+    def close
+      reconnect_socket
+    end
+
+    private
+
+    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
+
+      @socket
+    end
+
+    def reconnect_socket
+      @socket_mutex.synchronize do
+        begin
+          @socket&.close
+        rescue
+          nil
+        end
+        @socket = nil
+      end
+    end
+  end
+end

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/version.rb

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

data/lib/onlylogs.rb

@@ -4,6 +4,9 @@ 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.3
+  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,8 +82,11 @@ 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