octokiq 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f28e37cf9c233c23e2bd805a66f09499ab4f7076e8a6275576aa119c3f16f374
-  data.tar.gz: 12a6f510c04659f8bb636bf3e1f687efb798c8a365ef227c4b0a5ba3d2082848
+  metadata.gz: 44d0f352223a198828049c695b9f9eb6794c9e59e61c78437a725d04c9d89817
+  data.tar.gz: 69a40dc857ffc594a7d73ab3e439aed6f2e03d58923ebd76ee3336c759aa7069
 SHA512:
-  metadata.gz: 343e6dbfb7161aa9dbf0aee8006176073f814d838d2387127e99a498cba5dabc42b7df1b632687486382e4caebd509b3296020492eb4943c1bf01f71df990282
-  data.tar.gz: 92f38623fec01098154151acf6d13af9210cd117185871d2372cf25d246d704cf4202d5f985233f039caa70ba88b1207c2ff8488eb87a7b64db13acc713e8d61
+  metadata.gz: 5be9cc5ff099a09634c0af35e1d1764233f25f8d16f353d7e1c078a3c976dfb6cfd330779146c0e8b209f5a7ce2149e0900c7d0dde2ed5e49bb9fa04d482e5e7
+  data.tar.gz: 364d73063e5133ba872ee90454704212c66462ed4907c5a2f87662b68f12cb318a26e1d9d02a84ba79e03feca1fedb2e92478a4a0c48bc29b926087c688a1b95

data/CHANGELOG.md

@@ -12,4 +12,8 @@ Initial release 🚀
 ## 0.1.2 - 2020-12-30
 
 - Fix the ractor server loop bug
-- Add configuration `force_thread_mode`
+- Add configuration `force_thread_mode`
+
+## 0.1.3 - 2020-12-31
+
+- Seperate `server` and `client` concerns

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    octokiq (0.1.0)
+    octokiq (0.1.3)
       redis (~> 4.2)
 
 GEM

data/exe/octokiq

@@ -2,6 +2,7 @@
 
 require 'bundler/setup'
 require 'octokiq'
+require 'optparse'
 
 OptionParser.new do |opts|
   opts.banner = 'Usage: bundle exec octokiq [options]'

data/lib/octokiq.rb

@@ -1,16 +1,12 @@
-require 'redis'
-
-require 'etc'
-require 'logger'
-require 'json'
-require 'optparse'
-
 require 'octokiq/version'
-require 'octokiq/configuration'
+require 'octokiq/logger'
 require 'octokiq/connection'
-require 'octokiq/worker'
+require 'octokiq/consts'
+require 'octokiq/configuration'
 require 'octokiq/processor'
+require 'octokiq/client'
 require 'octokiq/server'
+require 'octokiq/worker'
 require 'octokiq/cmd'
 
 module Octokiq
@@ -25,14 +21,6 @@ module Octokiq
     @configuration ||= Configuration.new
   end
 
-  def server_connection
-    @server_connection ||= Connection.new
-  end
-
-  def client_connection
-    @client_connection ||= Connection.new
-  end
-
   def logger
     Logger.new($stdout)
   end

data/lib/octokiq/client.rb

@@ -0,0 +1,31 @@
+module Octokiq
+  module Client
+    extend self
+
+    class Configuration
+      attr_accessor :default_queue
+
+      def initialize
+        @default_queue = Consts::DEFAULT_QUEUE
+      end      
+    end
+
+    def push(*args)
+      connection.push(*args)
+    end
+
+    def configure
+      yield(configuration)
+    end
+  
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    private
+
+    def connection
+      @connection ||= Connection.new
+    end
+  end
+end

data/lib/octokiq/cmd.rb

@@ -2,36 +2,15 @@ module Octokiq
   class CMD
     def run
       puts logo
-      server.start
+      Server.start
     rescue Interrupt
       Octokiq.logger.info 'Bye!'
     end
 
     private
 
-    def server
-      @server ||= Server.new
-    end
-
     def logo
-      <<-EOF
-      _,gggggg,_                                                                 
-      ,d8P""d8P"Y8b,                I8                 ,dPYb,                      
-     ,d8'   Y8   "8b,dP             I8                 IP'`Yb                      
-     d8'    `Ybaaad88P'          88888888              I8  8I      gg              
-     8P       `""""Y8               I8                 I8  8bgg,   ""              
-     8b            d8     ,gggg,    I8      ,ggggg,    I8 dP" "8   gg     ,gggg,gg 
-     Y8,          ,8P    dP"  "Yb   I8     dP"  "Y8ggg I8d8bggP"   88    dP"  "Y8I 
-     `Y8,        ,8P'   i8'        ,I8,   i8'    ,8I   I8P' "Yb,   88   i8'    ,8I 
-      `Y8b,,__,,d8P'   ,d8,_    _ ,d88b, ,d8,   ,d8'  ,d8    `Yb,_,88,_,d8,   ,d8b 
-        `"Y8888P"'     P""Y8888PP 8P""Y8 P"Y8888P"    88P      Y88P""Y8P"Y8888P"88d
-                                                                                I8P
-                                                                                I8'
-                                                                                I8 
-                                                                                I8 
-                                                                                I8 
-                                                                                I8 
-      EOF
+      "Hello! Welcome to Octokiq!"
     end
   end
 end

data/lib/octokiq/configuration.rb

@@ -1,17 +1,9 @@
 module Octokiq
   class Configuration
-    attr_accessor :processors_count,
-                  :queue_prefix,
-                  :default_queue,
-                  :queues,
-                  :force_thread_mode
+    attr_accessor :queue_prefix
 
     def initialize
-      @processors_count = Etc.nprocessors
-      @queue_prefix = 'octokiq'
-      @default_queue = 'default'
-      @queues = [@default_queue]
-      @force_thread_mode = false
+      @queue_prefix = Consts::QUEUE_PREFIX
     end
   end
 end

data/lib/octokiq/connection.rb

@@ -1,3 +1,6 @@
+require 'redis'
+require 'json'
+
 module Octokiq
   class Connection
     attr_accessor :redis

data/lib/octokiq/consts.rb

@@ -0,0 +1,8 @@
+module Octokiq
+  module Consts
+    DEFAULT_QUEUE = 'default'.freeze
+    QUEUE_PREFIX = 'octokiq'.freeze
+    ITEM_CLASS_KEY = 'class'.freeze
+    ITEM_ARGS_KEY = 'args'.freeze
+  end
+end

data/lib/octokiq/logger.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 module Octokiq
   class Logger < ::Logger
   end

data/lib/octokiq/processor.rb

@@ -2,8 +2,8 @@ module Octokiq
   class Processor
     attr_accessor :klass, :args
     def initialize(job)
-      klass_name = job.fetch(Worker::CLASS_KEY)
-      @args = job.fetch(Worker::ARGS_KEY)
+      klass_name = job.fetch(Consts::ITEM_CLASS_KEY)
+      @args = job.fetch(Consts::ITEM_ARGS_KEY)
       @klass = Object.const_get(klass_name)
     end
 

data/lib/octokiq/server.rb

@@ -1,46 +1,84 @@
+require 'etc'
+
 module Octokiq
-  class Server
+  module Server
+    extend self
+
+    class Configuration
+      attr_accessor :concurrency,
+                    :queues,
+                    :thread_mode
+
+      def initialize
+        @concurrency = Etc.nprocessors
+        @queues = [Consts::DEFAULT_QUEUE]
+        @thread_mode = false
+      end
+    end
+
+    def configure
+      yield(configuration)
+    end
+  
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
     def start
-      handle_pipe
-      handle_tube
+      configuration.thread_mode ? handle_thread_jobs : ractor_workers
 
       loop do
-        job = Octokiq.server_connection.fetch(queues)
-        Octokiq.configuration.force_thread_mode ? tube << job : pipe << job
+        job = connection.fetch(queues)
+        pipe << job
       end
     end
 
     private
 
-    def handle_pipe
-      (1..Octokiq.configuration.processors_count).map do
-        Ractor.new(pipe, tube) do |pipe, tube|
-          loop do
-            job = pipe.take
-            begin
-              Processor.new(job).run
-            rescue Ractor::IsolationError => e
-              Octokiq.logger.warn 'Ractor::IsolationError'
-              tube << job
-            end
+    def connection
+      @connection ||= Connection.new
+    end
+
+    def ractor_workers
+      @ractor_workers ||= (1..concurrency).map do
+        Ractor.new(pipe) do |pipe|
+          while job = pipe.take
+            Ractor.yield Processor.new(job).run
           end
         end
       end
     end
 
-    def handle_tube
+    def handle_thread_jobs
+      semaphore = Mutex.new
+      counter = 0
       Thread.new do
-        loop do
-          job = tube.take
+        while counter < concurrency && job = pipe.take
+          semaphore.synchronize { counter += 1 }
           Thread.new do
             Processor.new(job).run
+            semaphore.synchronize { counter -= 1 }
           end
         end
       end
     end
 
+    def thread_workers
+      @thread_workers = []
+      Thread.new do
+        while job = pipe.take
+          Processor.new(job).run
+        end
+      end
+      @thread_workers
+    end
+
+    def concurrency
+      @concurrency ||= configuration.concurrency
+    end
+
     def queues
-      Octokiq.configuration.queues
+      configuration.queues
     end
 
     def pipe
@@ -50,13 +88,5 @@ module Octokiq
         end
       end
     end
-
-    def tube
-      @tube ||= Ractor.new do
-        loop do
-          Ractor.yield Ractor.receive
-        end
-      end
-    end
   end
 end

data/lib/octokiq/version.rb

@@ -1,3 +1,3 @@
 module Octokiq
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/lib/octokiq/worker.rb

@@ -1,14 +1,11 @@
 module Octokiq
   module Worker
-    CLASS_KEY = 'class'.freeze
-    ARGS_KEY = 'args'.freeze
-
     class Configuration
       OPTIONS = [:queue].freeze
       attr_accessor(*OPTIONS)
 
       def initialize
-        @queue = Octokiq.configuration.default_queue
+        @queue = Client.configuration.default_queue
       end
     end
 
@@ -18,7 +15,7 @@ module Octokiq
 
     module ClassMethods
       def perform_async(*args)
-        client_push(CLASS_KEY => self, ARGS_KEY => args)
+        _push(Consts::ITEM_CLASS_KEY => self, Consts::ITEM_ARGS_KEY => args)
       end
 
       def configuration
@@ -33,8 +30,8 @@ module Octokiq
 
       private
 
-      def client_push(item)
-        Octokiq.client_connection.push(configuration.queue, item)
+      def _push(item)
+        Client.push(configuration.queue, item)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octokiq
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Bran Liang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -45,9 +45,11 @@ files:
 - bin/setup
 - exe/octokiq
 - lib/octokiq.rb
+- lib/octokiq/client.rb
 - lib/octokiq/cmd.rb
 - lib/octokiq/configuration.rb
 - lib/octokiq/connection.rb
+- lib/octokiq/consts.rb
 - lib/octokiq/logger.rb
 - lib/octokiq/processor.rb
 - lib/octokiq/server.rb