onlylogs 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37909543bef9f932a762a08b53c0dfbebe9094f41e96d0de8740e1e1b4b66614
-  data.tar.gz: 1abced159b2385cd445b05196a6ac47801aeeaac96c8062729251aaf778733bd
+  metadata.gz: ca30039d330dc680af346b69a9d94e169f1d4e9f20c88901e8eadd7e31de4a22
+  data.tar.gz: 75ca252f9a28497cb229d44e2a0e27b54583913b034002a9fef3e591d92034c2
 SHA512:
-  metadata.gz: 4def45bcdb6d9c301f3cb2d65de39f2e27247a4ae5fd7835325e8f80781279ce7ed5ac280fea95cf7d61af2d9713fae008485f9e702f4ab747a151712340bf56
-  data.tar.gz: 74e0fa68229359024780f850dd2df95ab1d930b6a949ec85b63f20d7e8ff1253e79da81f384bb6057d588b10d67764dbaa7761db1212051c8e69c2841a8dce89
+  metadata.gz: 9486d5057bde025f77b2e5f66aa616b805dead3e136295341b9181622ae69277aca2f24f981820f48487cc0d7c7f17de4e2f24341160b448215398d9d87753f4
+  data.tar.gz: 9bbf4422321aa4d1cdcf690fa6ad597fd748b0f9c9d0f34e7291a015ec71ce091fee8ad05fb9eccbf8ea71adc768c48a2ed73bd8618c25fdff24aa9bb6478505

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

@@ -11,18 +11,12 @@
         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()">

data/lib/onlylogs/http_logger.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "uri"
+
+# This logger sends messages to onlylogs.io (or any Vector-compatible sink) directly via HTTP.
+# Unlike SocketLogger, it does not require a sidecar process or Puma plugin,
+# so it works from any process: Puma, GoodJob, Sidekiq, rake tasks, migrations, etc.
+
+module Onlylogs
+  class HttpLogger < Onlylogs::Logger
+    DEFAULT_BATCH_SIZE = 100
+    DEFAULT_FLUSH_INTERVAL = 0.5
+
+    def initialize(
+      local_fallback: $stdout,
+      drain_url: ENV["ONLYLOGS_DRAIN_URL"],
+      batch_size: ENV.fetch("ONLYLOGS_BATCH_SIZE", DEFAULT_BATCH_SIZE).to_i,
+      flush_interval: ENV.fetch("ONLYLOGS_FLUSH_INTERVAL", DEFAULT_FLUSH_INTERVAL).to_f
+    )
+      super(local_fallback)
+      @drain_url = drain_url
+      @batch_size = batch_size
+      @flush_interval = flush_interval
+      @queue = Queue.new
+      @mutex = Mutex.new
+
+      start_sender if @drain_url
+    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)
+      @queue << formatted if formatted && @drain_url
+      super
+    end
+
+    def close
+      flush
+      @running = false
+      @sender_thread&.join(2)
+    end
+
+    def flush
+      send_batch(drain_queue)
+    end
+
+    private
+
+    def start_sender
+      @running = true
+
+      @sender_thread = Thread.new do
+        batch = []
+        last_flush = Time.now
+
+        while @running || !@queue.empty?
+          begin
+            line = @queue.pop(true)
+            batch << line if line
+          rescue ThreadError
+            # queue empty
+          end
+
+          if batch.any? && (batch.size >= @batch_size || (Time.now - last_flush) >= @flush_interval)
+            send_batch(batch)
+            batch = []
+            last_flush = Time.now
+          end
+
+          sleep 0.01 if batch.empty?
+        end
+
+        send_batch(batch) if batch.any?
+      end
+
+      at_exit { close }
+    end
+
+    def drain_queue
+      lines = []
+      lines << @queue.pop(true) until @queue.empty?
+      lines
+    rescue ThreadError
+      lines
+    end
+
+    def send_batch(lines)
+      return if lines.empty?
+
+      uri = URI.parse(@drain_url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = (uri.scheme == "https")
+      http.read_timeout = 5
+      http.open_timeout = 2
+
+      request = Net::HTTP::Post.new(uri.path)
+      request.body = lines.join("\n")
+      request.content_type = "text/plain"
+
+      http.start { |h| h.request(request) }
+    rescue => e
+      warn "Onlylogs::HttpLogger error: #{e.class}: #{e.message}"
+    end
+  end
+end

data/lib/onlylogs/socket_logger.rb

@@ -39,10 +39,10 @@ module Onlylogs
       socket = ensure_socket
       socket&.puts(payload)
     rescue Errno::EPIPE, Errno::ECONNREFUSED, Errno::ENOENT => e
-      warn "Onlylogs::SocketLogger error: #{e.message}"
+      $stderr.puts "Onlylogs::SocketLogger error: #{e.message}" # rubocop:disable Style/StderrPuts
       reconnect_socket
     rescue => e
-      warn "Onlylogs::SocketLogger unexpected error: #{e.class}: #{e.message}"
+      $stderr.puts "Onlylogs::SocketLogger unexpected error: #{e.class}: #{e.message}" # rubocop:disable Style/StderrPuts
       reconnect_socket
     end
 
@@ -52,7 +52,7 @@ module Onlylogs
       @socket_mutex.synchronize do
         @socket ||= UNIXSocket.new(@socket_path)
       rescue => e
-        warn "Unable to connect to Onlylogs sidecar (#{@socket_path}): #{e.message}"
+        $stderr.puts "Unable to connect to Onlylogs sidecar (#{@socket_path}): #{e.message}" # rubocop:disable Style/StderrPuts
         @socket = nil
       end
 

data/lib/onlylogs/version.rb

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

data/lib/onlylogs.rb

@@ -4,6 +4,7 @@ require "onlylogs/engine"
 require "onlylogs/formatter"
 require "onlylogs/logger"
 require "onlylogs/socket_logger"
+require "onlylogs/http_logger"
 
 # require "zeitwerk"
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlylogs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Alessandro Rodi
@@ -74,6 +74,7 @@ files:
 - lib/onlylogs/configuration.rb
 - lib/onlylogs/engine.rb
 - lib/onlylogs/formatter.rb
+- lib/onlylogs/http_logger.rb
 - lib/onlylogs/logger.rb
 - lib/onlylogs/socket_logger.rb
 - lib/onlylogs/version.rb