fluent-plugin-sidekiq 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e1cd7fe47fd0d62ed8ae468dcc4566af6eb936d2
-  data.tar.gz: 7445249420b1da6d81ac77221601ee654eebaaae
+SHA256:
+  metadata.gz: 8f504b306f8ff6c58c7d4301481958095054d689b44a0eb47814baa496bbbc15
+  data.tar.gz: 1d3622dbb05fca9ca6cc58dc55e3005acd90f8be778a698c00feda974bb0c54a
 SHA512:
-  metadata.gz: aba8c0871abad60b4e271db33d78392ad9a8b4a54cb3c9b7fc960df47028b8bfa5925965147ef037da6f5c73c57cd806053abc94874e8da59ca7aac3d50725ee
-  data.tar.gz: 22c77e92f98c73ec1e5313f940cd6f5daae8fe895eb11d57a6418eb208b967e7433ce09296fc759cf8a5ee1b1260b77b89dfcae2acdb3f5cdb730cc13134f21a
+  metadata.gz: d266e1e43afa813a59f827439b58fc2b32a6a40e125060b76db612d32d735defce90cc33e41f410a826e2dc66af67f7bb27ab5e4523300a4164977bf46408fb4
+  data.tar.gz: df123481dddee992b042d27ecd75fc40c3581ed695d1a22375259741a9b9f76d9bad7c179213af1e9a094cf93a44b7389fc57302fe9833b0043f747940d3cab0

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/lib/fluent/plugin/out_sidekiq.rb

@@ -1,102 +1,105 @@
-require "redis"
-
-class Fluent::SidekiqOutput < Fluent::BufferedOutput
-  class Batch
-    attr_accessor :queue, :klass, :payload
+# frozen_string_literal: true
 
-    def initialize(q, k)
-      self.queue = q
-      self.klass = k
-      self.payload = {:class => k, :retry => true, :jid => "", :enqueued_at => 0, :args => [[]] }
-    end
+require 'fluent/plugin/output'
+require "redis"
 
-    def acceptable_batch(q, c, p, max_size)
-      q == queue && c == klass && (payload[:args][0].length + p.length) <= max_size
-    end
+module Fluent
+  module Plugin
+    class SidekiqOutput < Output
+      class Batch
+        attr_accessor :queue, :klass, :payload
 
-    def add_to_batch(p)
-      payload[:retry] = p['retry']
-      payload[:jid] = p['jid']
-      payload[:enqueued_at] = p['enqueued_at']
-      payload[:args][0] += p['args'][0]
-    end
+        def initialize(q, k)
+          self.queue = q
+          self.klass = k
+          self.payload = {:class => k, :retry => true, :jid => "", :enqueued_at => 0, :args => [[]] }
+        end
 
-    def enqueue(client)
-      client.sadd("queues", queue)
-      client.lpush("queue:#{queue}", JSON.generate(payload))
-    end
-  end
+        def acceptable_batch(q, c, p, max_size)
+          q == queue && c == klass && (payload[:args][0].length + p.length) <= max_size
+        end
 
-  VERSION = "0.0.4"
-  Fluent::Plugin.register_output("sidekiq", self)
+        def add_to_batch(p)
+          payload[:retry] = p['retry']
+          payload[:jid] = p['jid']
+          payload[:enqueued_at] = p['enqueued_at']
+          payload[:args][0] += p['args'][0]
+        end
 
-  config_param :redis_url, :string, :default => 'redis://localhost:6379'
-  config_param :redis_namespace, :string, :default => nil
-  config_param :max_batch_size, :integer, :default => 100
+        def enqueue(client)
+          client.sadd("queues", queue)
+          client.lpush("queue:#{queue}", JSON.generate(payload))
+        end
+      end
 
-  def start
-    super
-  end
+      VERSION = "0.1.0"
+      Fluent::Plugin.register_output("sidekiq", self)
 
-  def shutdown
-    super
-  end
+      config_param :redis_url, :string, :default => 'redis://localhost:6379'
+      config_param :redis_namespace, :string, :default => nil
+      config_param :max_batch_size, :integer, :default => 100
 
-  def format(tag, time, record)
-    [tag, time, record].to_msgpack
-  end
+      def format(tag, time, record)
+        [tag, time, record].to_msgpack
+      end
 
-  def redis_client
-    opts = {url: @redis_url, driver: :hiredis}
-    client = Redis.new(opts)
-    if @redis_namespace
-      require "redis/namespace"
-      Redis::Namespace.new(@redis_namespace, client)
-    else
-      client
-    end
-  end
+      def formatted_to_msgpack_binary
+        true
+      end
 
-  def write(chunk)
-    client = redis_client
-    scheduled_jobs = []
-    batches = []
-    manually_queue = []
-
-    chunk.msgpack_each do |tag, time, data|
-      at = data.delete('at')
-      if at
-        scheduled_jobs << [at, data['payload']]
-      else
-        payload = JSON.parse(data['payload'])
-        if payload['args'][0].kind_of?(Array) && payload['args'][0].all? { |a| a.kind_of?(Hash) }
-          queue = data.delete('queue')
-          klass = payload['class']
+      def redis_client
+        opts = {url: @redis_url, driver: :hiredis}
+        client = Redis.new(opts)
+        if @redis_namespace
+          require "redis/namespace"
+          Redis::Namespace.new(@redis_namespace, client)
+        else
+          client
+        end
+      end
 
-          batch = batches.find { |b| b.acceptable_batch(queue, klass, payload['args'][0], max_batch_size) }
-          if !batch
-            batch = Batch.new(queue, klass)
-            batches << batch
+      def write(chunk)
+        client = redis_client
+        scheduled_jobs = []
+        batches = []
+        manually_queue = []
+
+        chunk.msgpack_each do |tag, time, data|
+          at = data.delete('at')
+          if at
+            scheduled_jobs << [at, data['payload']]
+          else
+            payload = JSON.parse(data['payload'])
+            if payload['args'][0].kind_of?(Array) && payload['args'][0].all? { |a| a.kind_of?(Hash) }
+              queue = data.delete('queue')
+              klass = payload['class']
+
+              batch = batches.find { |b| b.acceptable_batch(queue, klass, payload['args'][0], max_batch_size) }
+              if !batch
+                batch = Batch.new(queue, klass)
+                batches << batch
+              end
+
+              batch.add_to_batch(payload)
+            else
+              # Manual queuing
+              manually_queue << data
+            end
           end
+        end
 
-          batch.add_to_batch(payload)
-        else
-          # Manual queuing
-          manually_queue << data
+        if scheduled_jobs.length > 0
+          client.zadd('schedule', scheduled_jobs)
+        end
+        batches.each do |batch|
+          batch.enqueue(client)
+        end
+        manually_queue.each do |data|
+          queue = data.delete('queue')
+          client.sadd('queues', queue)
+          client.lpush("queue:#{queue}", data['payload'])
         end
       end
     end
-
-    if scheduled_jobs.length > 0
-      client.zadd('schedule', scheduled_jobs)
-    end
-    batches.each do |batch|
-      batch.enqueue(client)
-    end
-    manually_queue.each do |data|
-      queue = data.delete('queue')
-      client.sadd('queues', queue)
-      client.lpush("queue:#{queue}", data['payload'])
-    end
   end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Scarborough
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Sidekiq plugin for Fluentd
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -101,24 +101,23 @@ homepage: https://github.com/GoCarrot/fluent-plugin-sidekiq
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Sidekiq plugin for Fluentd
 test_files: []