lokilogger 0.6.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b658e3b80bf4ab3cc950ab3d9112398a2572a0be682319b7f5ee5561e95427f
-  data.tar.gz: 7be0372d1f05446788643cc62564a932364bfb942b8eabb5acc37584891bcd6e
+  metadata.gz: beca007a56461abf51d521051073e9514f30ce6834b9d2a0f1cf10a0016242c9
+  data.tar.gz: 9ffee2c539de6dc7803a93538452e24639f5a2110a33d8c059bdc44e2004c160
 SHA512:
-  metadata.gz: dc550875c2e5ba7930c1c87282be7f14e28c9262f7838333246c9670374d5b45f733869bfc12bd225e965260f19258b79e7d71cbaf1320e7bd095b1beadb4799
-  data.tar.gz: e881dfa29a1a2fb8dc44904d2059a75bf7d0b1465880551dc35fb7215c746800af9ff269d6fc6bd6f780d8a7f3197e0c167c00609b899805ad4dab17af97986e
+  metadata.gz: c65d8d472ead0c1d655acdaf876e65e15e5f3f89c90471a3b4519b975751ddb6b3df1d8c63c6e0964fc228d918397dec10e427722318a227a43b94688129877c
+  data.tar.gz: dc681934d3d5a921bec4631574006d9765d073ac5f3a136641a16d69093881e9e5c7f536cefe8c8236ff1bce888d9f711b0a8fa21c8369d875702974788cba47

data/README.adoc

@@ -61,13 +61,13 @@ Start by creating a new logger instance:
 ----
 # required: url, log_level, version and tags
 # optional: username and password (if one of them is nil, no auth will be used)
-logger = Lokilogger.new({url:, log_level: 0, version: "v1", username:, password:, tags: {foo: "bar"}})
+logger = Lokilogger::Logger.new({url:, log_level: 0, version: "v1", username:, password:, tags: {foo: "bar"}})
 ----
 
 If you need proxy or custom TLS settings, you can optionally pass as well:
 
 - ssl_options (link:https://lostisland.github.io/faraday/#/customization/ssl-options[Faraday docs on ssl options])
-- proxy_options (link:https://lostisland.github.io/faraday/#/customization/proxy-options[Farady docs on proxy options])
+- proxy_options (link:https://lostisland.github.io/faraday/#/customization/proxy-options[Faraday docs on proxy options])
 
 then it's straight forward:
 

data/lib/lokilogger/client.rb

@@ -17,9 +17,7 @@ module Lokilogger
 
       Faraday.default_adapter = :async_http
       @conn = Faraday.new url: @config[:url], headers: {"Content-Type" => "application/json"}, ssl: ssl_options, proxy: proxy_options, request: request_options do |builder|
-        if @config[:username] && @config[:password]
-          builder.request :authorization, :basic, @config[:username], @config[:password]
-        end
+        builder.request :authorization, :basic, @config[:username], @config[:password] if @config[:username] && @config[:password]
       end
     end
 

data/lib/lokilogger/formatter.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Lokilogger
+  # Default formatter for log messages.
+  class Formatter
+    Format = "%.1s, [%s #%d] %5s -- %s: %s\n"
+    DatetimeFormat = "%Y-%m-%dT%H:%M:%S.%6N"
+
+    attr_accessor :datetime_format
+
+    def initialize
+      @datetime_format = nil
+    end
+
+    def call severity, time, progname, msg
+      format Format, severity, format_datetime(time), Process.pid, severity, progname, msg2str(msg)
+    end
+
+    private
+
+    def format_datetime time
+      time.strftime(@datetime_format || DatetimeFormat)
+    end
+
+    def msg2str msg
+      case msg
+        when ::String
+          msg
+        when ::Exception
+          "#{msg.message} (#{msg.class})\n#{msg.backtrace.join "\n" if msg.backtrace}"
+        else
+          msg.inspect
+      end
+    end
+  end
+end

data/lib/lokilogger/severity.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Lokilogger
+  # Logging severity.
+  module Severity
+    # Low-level information, mostly for developers.
+    DEBUG = 0
+    # Generic (useful) information about system operation.
+    INFO = 1
+    # A warning.
+    WARN = 2
+    # A handleable error condition.
+    ERROR = 3
+    # An unhandleable error that results in a program crash.
+    FATAL = 4
+    # An unknown message that should always be logged.
+    UNKNOWN = 5
+
+    LEVELS = {"debug" => DEBUG, "info" => INFO, "warn" => WARN, "error" => ERROR, "fatal" => FATAL, "unknown" => UNKNOWN}.freeze
+    private_constant :LEVELS
+
+    def self.coerce severity
+      if severity.is_a? Integer
+        severity
+      else
+        key = severity.to_s.downcase
+        LEVELS[key] || fail(ArgumentError, "invalid log level: #{severity}")
+      end
+    end
+  end
+end

data/lib/lokilogger/version.rb

@@ -2,5 +2,5 @@
 
 # Main namespace.
 module Lokilogger
-  VERSION = "0.6.0"
+  Version = "1.1.0"
 end

data/lib/lokilogger.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "lokilogger/formatter"
+require "lokilogger/severity"
 require "zeitwerk"
 
 Zeitwerk::Loader.new.then do |loader|
@@ -14,77 +16,109 @@ module Lokilogger
     @loader ||= registry.loaders.find { |loader| loader.tag == File.basename(__FILE__, ".rb") }
   end
 
-  def self.new config
-    @client = Lokilogger::Client.new config
-    self
-  end
+  class Logger
+    include Severity
 
-  def self.debug(*args)
-    message "debug", args
-  end
+    def initialize config
+      @client = Lokilogger::Client.new config
+      @default_formatter = Formatter.new
+    end
 
-  def self.debug?
-    true
-  end
+    def datetime_format= datetime_format
+      @default_formatter.datetime_format = datetime_format
+    end
 
-  def self.info(*args)
-    message "info", args
-  end
+    def datetime_format
+      @default_formatter.datetime_format
+    end
 
-  def self.info?
-    true
-  end
+    attr_accessor :formatter
 
-  def self.warn(*args)
-    message "warn", args
-  end
+    def debug(*args)
+      message "debug", args
+    end
 
-  def self.warn?
-    true
-  end
+    def debug?
+      @client.log_level <= DEBUG
+    end
 
-  def self.error(*args)
-    message "error", args
-  end
+    def debug!
+      @client.log_level = DEBUG
+    end
 
-  def self.error?
-    true
-  end
+    def info(*args)
+      message "info", args
+    end
 
-  def self.fatal(*args)
-    message "fatal", args
-  end
+    def info?
+      @client.log_level <= INFO
+    end
 
-  def self.fatal?
-    true
-  end
+    def info!
+      @client.log_level = INFO
+    end
 
-  def self.unknown(*args)
-    message "unknown", args
-  end
+    def warn(*args)
+      message "warn", args
+    end
 
-  def self.unknown?
-    true
-  end
+    def warn?
+      @client.log_level <= WARN
+    end
 
-  def self.level= level
-    @client.log_level = level
-  end
+    def warn!
+      @client.log_level = WARN
+    end
 
-  def self.level
-    @client.log_level
-  end
+    def error(*args)
+      message "error", args
+    end
 
-  def self.formatter
-  end
+    def error?
+      @client.log_level <= ERROR
+    end
 
-  def self.formatter=(*args)
-  end
+    def error!
+      @client.log_level = ERROR
+    end
+
+    def fatal(*args)
+      message "fatal", args
+    end
+
+    def fatal?
+      @client.log_level <= FATAL
+    end
+
+    def fatal!
+      @client.log_level = FATAL
+    end
+
+    def unknown(*args)
+      message "unknown", args
+    end
+
+    def unknown?
+      @client.log_level <= UNKNOWN
+    end
+
+    def unknown!
+      @client.log_level = UNKNOWN
+    end
+
+    def level= severity
+      @client.log_level = Severity.coerce severity
+    end
+
+    def level
+      @client.log_level
+    end
 
-  def self.message(severity, *args)
-    message = args[0][0]
-    extra_tags = args[0][1] if args[0].count > 1
+    def message(severity, *args)
+      message = args[0][0]
+      extra_tags = args[0][1] if args[0].count > 1
 
-    @client.request severity, message, extra_tags
+      @client.request severity, message, extra_tags
+    end
   end
 end

data/lokilogger.gemspec

@@ -6,7 +6,7 @@ require "lokilogger/version"
 
 Gem::Specification.new do |spec|
   spec.name = "lokilogger"
-  spec.version = Lokilogger::VERSION
+  spec.version = Lokilogger::Version
   spec.authors = ["Nils Bartels"]
   spec.email = ["rubygems@nils.bartels.xyz"]
   spec.homepage = "https://gitlab.com/sukunai/lokilogger"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lokilogger
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nils Bartels
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-03 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -106,6 +106,8 @@ files:
 - lib/lokilogger.rb
 - lib/lokilogger/client.rb
 - lib/lokilogger/error.rb
+- lib/lokilogger/formatter.rb
+- lib/lokilogger/severity.rb
 - lib/lokilogger/version.rb
 - lokilogger.gemspec
 homepage: https://gitlab.com/sukunai/lokilogger