onlylogs 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f2f05cff2b5f48634427295d3704774b1431c85f5bbba89a5adc9d3a6769c79
-  data.tar.gz: 16fc0ca2ec651f9523e266ec883a796f2dc94bb46b952b5b6aaf0eb527fd8871
+  metadata.gz: 5d17b58f1bc49d7f70ea61867d8c8e78be1fc25f1ede62f0b477764c97b78752
+  data.tar.gz: 3de1a2520cfb58fc74eab4152a43e20dc0082ec5099272efee00761c15ce3e1e
 SHA512:
-  metadata.gz: 7625fcd6b6b275a4008e88d7ec9a085b8277854f759472a7eea0acb98d2b8d81c14023ddb8eae313f74bf95d82b9ce8d134fdc0b52af019d84d560a2e62fb7e8
-  data.tar.gz: 104a06ec0c73c0885a89cce09dd25597d4c013c2cac9ab9b88f32a77d785aba323885f6eb6cc7a28bfe87c0e0792777d1aae16e6188ffb7bcc589961b8e7a4f6
+  metadata.gz: 7079c7f67be0048382b9029ef636a17c6de654c49ae1c17346cfbfad99e7015a1ffed9a1ef1c4313b45f6cad2bed839dc804f39b616f46bb55d4203c3cde8bc8
+  data.tar.gz: 4630f69bf7066024413e4251747cc0da907f8d7912eab6eae78fb1c4b9ac3fa4d2bb026e0cc5e9452e9e78c289bf120c82724207426f88e7886b6ea92077d337

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

@@ -1,49 +1 @@
-<div class="sidebar-layout" data-controller="toggle-class" data-toggle-class-toggle-class="closed">
-  <aside id="sidebar">
-    <div class="sidebar-menu">
-      <%= link_to onlylogs.root_path, class: "btn sidebar-menu__button" do %>
-        <%= image_tag "onlylogs/logo.png" %>
-      <% end %>
-      <div class="sidebar-menu__content">
-        <div class="sidebar-menu__items">
-          <div class="sidebar-menu__group">
-            <div class="sidebar-menu__group-label">Projects</div>
-            <nav class="sidebar-menu__items">
-              <%= link_to "All Projects", root_path, class: "btn sidebar-menu__button" %>
-
-              <nav class="sidebar-menu__sub">
-                <nav class="sidebar-menu__sub text-sm">
-                    <div>
-                      <% if Onlylogs::File.text_file?(drain_file) %>
-                        <%= link_to drain_file.basename, project_path(@project, file_path: Onlylogs::SecureFilePath.encrypt(drain_file.to_s)) %>
-                      <% else %>
-                        <%= drain_file.basename %>
-                      <% end %>
-                      <small>(<%= number_to_human_size(File.size(drain_file)) %>)</small>
-                      <%= link_to project_drain_file_path(@project, Onlylogs::SecureFilePath.encrypt(drain_file.to_s)),
-                                  title: t('drain_files.show.title'),
-                                  class: 'download-link' do %>
-                        <i class="fa-regular fa-download" aria-label="<%= t('drain_files.show.title') %>"></i>
-                      <% end %>
-                    </div>
-                </nav>
-              </nav>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </aside>
-  <main id="main">
-    <header class="flex items-center gap show@md">
-      <button type="button" class="btn btn--borderless p-1" data-action="toggle-class#toggle">
-        <i class="fa-regular fa-sidebar"></i>
-        <span class="sr-only">Toggle Sidebar</span>
-      </button>
-      <div class="separator-vertical mi-1" style="--sep-size: 1rem"></div>
-    </header>
-
-    <%= render partial: "onlylogs/shared/log_container", locals: { log_file_path: @log_file_path, tail: @max_lines, filter: @filter, autoscroll: @autoscroll } %>
-  </main>
-</div>
+<%= render partial: "onlylogs/shared/log_container", locals: { log_file_path: @log_file_path, tail: @max_lines, filter: @filter, autoscroll: @autoscroll } %>

data/bin/onlylogs_sidecar

@@ -0,0 +1,112 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# this is a simple sidecar process that takes log lines sent into the socket and sends them to the drain url in batches.
+# You can also attach it to puma using `plugin :onlylogs_sidecar` in your config/puma.rb file so you don't need to run it manually.
+# The following parameters are availble:
+# - ONLYLOGS_DRAIN_URL: the url to the drain. this is mandatory and must be set.
+# - ONLYLOGS_SIDECAR_SOCKET: the path to the socket file. this is optional and will default to tmp/sockets/onlylogs-sidecar.sock in the current directory.
+# - ONLYLOGS_BATCH_SIZE: the number of lines to batch before sending. this is optional and will default to 100.
+# - ONLYLOGS_FLUSH_INTERVAL: the interval in seconds to flush the batch. this is optional and will default to 0.5 seconds.
+
+require "socket"
+require "net/http"
+require "uri"
+require "thread"
+require "fileutils"
+
+drain_url = ENV["ONLYLOGS_DRAIN_URL"]
+socket_path = ENV.fetch("ONLYLOGS_SIDECAR_SOCKET", File.expand_path("tmp/sockets/onlylogs-sidecar.sock", Dir.pwd))
+batch_size = ENV.fetch("ONLYLOGS_BATCH_SIZE", "100").to_i
+flush_interval = ENV.fetch("ONLYLOGS_FLUSH_INTERVAL", "0.5").to_f
+
+if drain_url.to_s.strip.empty?
+  error "[OnlylogsSidecar] ERROR: ONLYLOGS_DRAIN_URL is not set. Exiting."
+  exit 1
+end
+
+uri = URI.parse(drain_url)
+FileUtils.mkdir_p(File.dirname(socket_path))
+FileUtils.rm_f(socket_path)
+
+running = true
+queue = Queue.new
+
+trap("INT") { running = false }
+trap("TERM") { running = false }
+
+server = UNIXServer.new(socket_path)
+
+accept_thread = Thread.new do
+  while running
+    begin
+      client = server.accept_nonblock
+    rescue IO::WaitReadable
+      IO.select([server])
+      retry
+    rescue IOError, Errno::EBADF
+      break
+    end
+
+    Thread.new(client) do |conn|
+      begin
+        conn.each_line do |line|
+          cleaned = line.to_s.strip
+          queue << cleaned unless cleaned.empty?
+        end
+      rescue => e
+        warn "[OnlylogsSidecar] client error: #{e.class}: #{e.message}"
+      ensure
+        conn.close rescue nil
+      end
+    end
+  end
+end
+
+def send_batch(uri, lines)
+  return if lines.empty?
+
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl = (uri.scheme == "https")
+  request = Net::HTTP::Post.new(uri.path)
+  request.body = lines.join("\n")
+  puts "[OnlylogsSidecar] Sending #{request.body}"
+  request.content_type = "text/plain"
+  http.read_timeout = 5
+  http.open_timeout = 2
+  http.start
+  http.request(request)
+rescue => e
+  warn "[OnlylogsSidecar] HTTP error: #{e.class}: #{e.message}"
+ensure
+  http&.finish rescue nil
+end
+
+batch = []
+last_flush = Time.now
+
+while running || !queue.empty?
+  begin
+    line = queue.pop(true)
+    batch << line if line
+  rescue ThreadError
+    # queue empty
+    sleep 0.01
+  end
+
+  next if batch.empty?
+
+  if batch.size >= batch_size || (Time.now - last_flush) >= flush_interval
+    send_batch(uri, batch)
+    batch.clear
+    last_flush = Time.now
+  end
+end
+
+# Final flush
+send_batch(uri, batch) unless batch.empty?
+
+running = false
+accept_thread.kill
+server.close rescue nil
+FileUtils.rm_f(socket_path)

data/lib/onlylogs/configuration.rb

@@ -85,10 +85,6 @@ module Onlylogs
     end
   end
 
-  def self.allowed_files
-    configuration.allowed_files
-  end
-
   def self.default_log_file_path
     configuration.default_log_file_path
   end

data/lib/onlylogs/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlylogs
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alessandro Rodi
@@ -27,7 +27,8 @@ description: This gem includes all the tools needed to view and stream you log f
   directly on a web interface.
 email:
 - alessandro.rodi@renuo.ch
-executables: []
+executables:
+- onlylogs_sidecar
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,11 +68,9 @@ 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
+- bin/onlylogs_sidecar
 - config/importmap.rb
-- config/puma_plugins/vector.rb
 - config/routes.rb
-- config/udp_logger.rb
-- config/vector.toml
 - db/migrate/20250902112548_create_books.rb
 - lib/onlylogs.rb
 - lib/onlylogs/configuration.rb

data/config/puma_plugins/vector.rb

@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-require "puma/plugin"
-require "rbconfig"
-require "timeout"
-require "shellwords"
-
-Puma::Plugin.create do
-  def start(launcher)
-    @launcher = launcher
-    @events = launcher.events
-    @options = launcher.config.options
-    @vector_pid = nil
-
-    setup_paths
-    start_vector
-    register_hooks
-  end
-
-  private
-
-  def setup_paths
-    @app_root = @options[:directory] || Dir.pwd
-    @vector_bin = env_or_option("ONLYLOGS_VECTOR_BIN", :onlylogs_vector_bin, "vector")
-    @vector_config = env_or_option(
-      "ONLYLOGS_VECTOR_CONFIG",
-      :onlylogs_vector_config,
-      File.expand_path("../vector.toml", __dir__)
-    )
-    @vector_args = env_or_option("ONLYLOGS_VECTOR_ARGS", :onlylogs_vector_args, "")
-    @dsn = env_or_option("ONLYLOGS_DSN", :onlylogs_dsn, "https://onlylogs.io/drain/testmac")
-  end
-
-  def register_hooks
-    events = @launcher.events
-    events.register(:on_restart) { restart_vector }
-    at_exit { stop_vector }
-  end
-
-  def env_or_option(env_key, option_key, default)
-    ENV.fetch(env_key, @options.fetch(option_key, default))
-  end
-
-  def start_vector
-    stop_vector if @vector_pid
-
-    unless File.exist?(@vector_config)
-      warn "Vector config not found at #{@vector_config}; skipping start"
-      return
-    end
-
-    args = [ @vector_bin, "--config", @vector_config ]
-    args += Shellwords.split(@vector_args.to_s) unless @vector_args.to_s.empty?
-
-    info "Starting Vector sidecar (config: #{@vector_config}, dsn: #{@dsn})"
-    env = { "ONLYLOGS_DSN" => @dsn }
-    @vector_pid = Process.spawn(env, *args, chdir: @app_root, pgroup: true)
-  rescue Errno::ENOENT => e
-    error "Unable to start Vector sidecar: #{e.message}"
-  end
-
-  def restart_vector
-    info "Restarting Vector sidecar"
-    start_vector
-  end
-
-  def stop_vector
-    return unless @vector_pid
-
-    info "Stopping Vector sidecar"
-    pgid = Process.getpgid(@vector_pid)
-    Process.kill("TERM", -pgid)
-    Timeout.timeout(5) { Process.wait(@vector_pid) }
-  rescue Errno::ESRCH, Errno::ECHILD
-    # already stopped
-  rescue Timeout::Error
-    warn "Vector sidecar did not stop in time, killing"
-    Process.kill("KILL", -pgid) rescue nil
-  ensure
-    @vector_pid = nil
-  end
-
-  def info(message)
-    @events.log("[VectorSidecar] #{message}")
-  end
-
-  def warn(message)
-    @events.log("[VectorSidecar][WARN] #{message}")
-  end
-
-  def error(message)
-    @events.error("[VectorSidecar][ERROR] #{message}")
-  end
-end

data/config/udp_logger.rb

@@ -1,40 +0,0 @@
-# udp_logger.rb
-require "logger"
-require "socket"
-
-class UdpLogger < Logger
-  def initialize(host: "127.0.0.1", port: 6000, local_fallback: $stdout)
-    # Use a normal Logger underneath so we still see logs locally
-    super(local_fallback)
-
-    @udp_host = host
-    @udp_port = port
-    @socket   = UDPSocket.new
-  end
-
-  # Override Logger#add, which all the level methods delegate to
-  def add(severity, message = nil, progname = nil, &block)
-    # Same semantics as Logger:
-    if message.nil?
-      if block_given?
-        message = block.call
-      else
-        message = progname
-        progname = nil
-      end
-    end
-
-    # Send plain text over UDP to Vector
-    begin
-      payload = message.to_s
-      @socket.send(payload, 0, @udp_host, @udp_port)
-    rescue => e
-      # Swallow UDP errors so logging never crashes the app
-      warn "UDP logger error: #{e.class}: #{e.message}"
-    end
-
-    # Also log locally (stdout / file) via normal Logger behavior
-    super(severity, message, progname, &block)
-  end
-end
-

data/config/vector.toml

@@ -1,32 +0,0 @@
-# Where Vector keeps internal state (buffers, etc.)
-data_dir = "/usr/local/var/lib/vector"
-
-# --- 1) SOURCE: UDP socket listening on localhost:6000 ---
-
-[sources.udp_logs]
-type = "socket"
-mode = "udp"                       # UDP mode
-address = "127.0.0.1:6000"
-
-# --- 2) SINK: console (for debugging, optional but very handy) ---
-
-[sinks.console]
-type = "console"
-inputs = ["udp_logs"]
-encoding.codec = "json"
-target = "stdout"
-
-# --- 3) SINK: Onlylogs HTTP drain ---
-
-[sinks.onlylogs]
-type = "http"
-inputs = ["udp_logs"]             # consume events from udp_logs
-method = "post"
-uri = "${ONLYLOGS_DSN}"
-
-encoding.codec = "text"
-
-#[sinks.onlylogs.request]
-# Adjust headers if Onlylogs expects something specific
-#headers.Content-Type = "application/json"
-