remote_service 0.1.2 → 0.2.0

data/.travis.yml

@@ -11,4 +11,8 @@ before_install:
   - docker-compose up -d
 
 script:
-  - bundle exec rake test
+  - bundle exec rake test
+
+addons:
+  code_climate:
+    repo_token: 683ec4c66a12e8212b328523e894dd74064f340847357fb208b5bc5a9fb7e31e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remote_service (0.1.1)
+    remote_service (0.2.0)
       msgpack (~> 1.0)
       nats (~> 0.8.0)
 
@@ -29,4 +29,4 @@ DEPENDENCIES
   remote_service!
 
 BUNDLED WITH
-   1.12.5
+   1.13.1

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 TODO: Write your name
+Copyright (c) 2016 Marek Galovic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-# RemoteService ![img](https://travis-ci.com/marekgalovic/ruby-remote-service.svg?token=tzyPCMPPikt2LiEzxR71&branch=master) [![Gem Version](https://badge.fury.io/rb/remote_service.svg)](https://badge.fury.io/rb/remote_service)
+# RemoteService ![img](https://travis-ci.com/marekgalovic/ruby-remote-service.svg?token=tzyPCMPPikt2LiEzxR71&branch=master) [![Code Climate](https://codeclimate.com/github/marekgalovic/ruby-remote-service/badges/gpa.svg)](https://codeclimate.com/github/marekgalovic/ruby-remote-service) [![Gem Version](https://badge.fury.io/rb/remote_service.svg)](https://badge.fury.io/rb/remote_service)
 Remote services made easy. This gem is basically RPC client/server implemented on top of awesome [NATS](http://nats.io/) project. Every service you want to use is exposed through class that extends `RemoteService::Proxy`. Service itself extends `RemoteService::Service` and should define all methods that you want to call from clients.
 
 ## Installation
@@ -59,6 +59,9 @@ sleep(0.1) # wait for non-blocking call to execute
 puts ServiceA.all(123, keyword: 'value')
 ```
 
+# Todo
+Service worker threads
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/marekgalovic/ruby-remote-service. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/examples/client.rb

@@ -4,7 +4,7 @@ require "bundler/setup"
 require "remote_service"
 
 class ServiceA < RemoteService::Proxy
-  timeout 100
+  timeout 1000
 end
 
 class ServiceB < RemoteService::Proxy
@@ -14,13 +14,14 @@ end
 RemoteService.logger.level = Logger::DEBUG
 RemoteService.connect(brokers: ['nats://127.0.0.1:4222', 'nats://127.0.0.1:5222', 'nats://127.0.0.1:6222'])
 
+
 clients = []
-4.times do
+16.times do
   clients << Thread.new do
     loop do
       ServiceA.all(123, keyword: 'value')
-      ServiceB.users
-      sleep(0.01)
+      # ServiceB.users
+      sleep(1)
     end
   end
 end

data/examples/service_a.rb

@@ -7,4 +7,5 @@ class ServiceA < RemoteService::Service
   end
 end
 
-ServiceA.start(brokers: ['nats://127.0.0.1:5222'])
+RemoteService.logger.level = Logger::INFO
+ServiceA.start(brokers: ['nats://localhost:4222'])

data/lib/remote_service/call.rb

@@ -17,7 +17,7 @@ module RemoteService
     private
 
     def call_service
-      RemoteService::Queue.instance.request(queue, {action: action, params: params}) do |response|
+      Queue.instance.request(queue, {action: action, params: params}) do |response|
         yield(response['result'], response['error'])
       end
     end

data/lib/remote_service/connector/nats.rb

@@ -5,7 +5,7 @@ module RemoteService
     class Nats
       attr_reader :brokers
 
-      def initialize(brokers:)
+      def initialize(brokers)
         @brokers = brokers
         @mutex = Mutex.new
       end
@@ -15,8 +15,8 @@ module RemoteService
         connect(&block)
       end
 
-      def stop
-        NATS.stop
+      def exit
+        @conn_thread.exit
       end
 
       def publish(to_queue, message)
@@ -55,7 +55,7 @@ module RemoteService
 
       def connection_thread
         lock = Util::Lock.new
-        Thread.new do
+        @conn_thread = Thread.new do
           connect do |connection|
             lock.unlock(connection)
           end

data/lib/remote_service/queue.rb

@@ -6,14 +6,19 @@ module RemoteService
   class Queue
     include Singleton
 
+    EXIT_SIGNALS = ['INT', 'TERM', 'SIGQUIT']
+
     def connect(brokers, &block)
-      @conn = RemoteService::Connector::Nats.new(brokers)
+      brokers ||= ENV.fetch('REMOTE_SERVICE_BROKERS', 'nats://127.0.0.1:4222').split(',')
+      @conn = Connector::Nats.new(brokers)
       @conn.start(&block)
     end
 
-    def service(service_handler, workers=16)
+    def service(service_handler, workers, monitor_interval)
+      workers ||= ENV.fetch('REMOTE_SERVICE_WORKERS', 4)
+      monitor_interval ||= ENV.fetch('REMOTE_SERVICE_MONITOR_INTERVAL', 5)
+      @worker_pool = WorkerPool.new(workers.to_i, monitor_interval.to_i)
       @service_handler = service_handler
-      @workers = workers
       start_service_subscriber
     end
 
@@ -40,17 +45,20 @@ module RemoteService
 
     def start_service_subscriber
       RemoteService.logger.debug "SERVICE QUEUE: #{service_queue_name}"
-      @conn.subscribe(service_queue_name) do |request, reply_to|
-        begin
-          payload = decode(request)
-          RemoteService.logger.debug "FETCHED - REPLY_TO:[#{reply_to}] PAYLOAD:[#{payload}]"
-          @service_handler.handle(payload, reply_to)
-        rescue => e
-          RemoteService.logger.error(e)
-          Queue.instance.publish(
-            reply_to,
-            {result: nil, error: {name: e.class.name, message: e.message, backtrace: e.backtrace}},
-          )
+      @worker_pool.start
+      @conn.subscribe(service_queue_name) do |*args|
+        @worker_pool.run(*args) do |request, reply_to|
+          begin
+            payload = decode(request)
+            RemoteService.logger.debug "FETCHED - REPLY_TO:[#{reply_to}] PAYLOAD:[#{payload}]"
+            @service_handler.handle(payload, reply_to)
+          rescue => e
+            RemoteService.logger.error(e)
+            Queue.instance.publish(
+              reply_to,
+              {result: nil, error: {name: e.class.name, message: e.message, backtrace: e.backtrace}},
+            )
+          end
         end
       end
     end
@@ -70,5 +78,15 @@ module RemoteService
     def decode(payload)
       MessagePack.unpack(payload)
     end
+
+    def setup_signal_handlers
+      EXIT_SIGNALS.each do |sig|
+        trap(sig) do
+          @worker_pool.exit if service?
+          @conn.exit if !service?
+          EM.stop
+        end
+      end
+    end
   end
 end

data/lib/remote_service/service.rb

@@ -25,10 +25,10 @@ module RemoteService
     end
 
     class << self
-      def start(brokers, workers=16)
+      def start(brokers:nil, workers:nil, monitor_interval:nil)
         queue = Queue.instance
         queue.connect(brokers) do
-          queue.service(self.instance, workers)
+          queue.service(self.instance, workers, monitor_interval)
         end
       end
     end

data/lib/remote_service/version.rb

@@ -1,3 +1,3 @@
 module RemoteService
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/remote_service/worker_pool.rb

@@ -0,0 +1,61 @@
+module RemoteService
+  class WorkerPool
+    attr_reader :queue, :threads
+
+    def initialize(worker_count, monitor_interval)
+      @worker_count = worker_count
+      @monitor_interval = monitor_interval
+      @threads = []
+      @queue = ::Queue.new
+    end
+
+    def run(*args, &block)
+      queue.push({ args: args, callable: block })
+    end
+
+    def start
+      spawn_workers
+      monitor_thread
+      RemoteService.logger.info "WORKER POOL - WORKERS: #{threads.size}"
+    end
+
+    def join
+      threads.each do |thread|
+        thread.join
+      end
+      monitor_thread.join
+    end
+
+    def exit
+      threads.each do |thread|
+        thread.exit
+      end
+      monitor_thread.exit
+    end
+
+    private
+
+    def spawn_workers
+      @worker_count.times do
+        @threads << Thread.new do
+          loop do
+            data = queue.pop
+            data[:callable].call(*data[:args])
+          end
+        end
+      end
+    end
+
+    def monitor_thread
+      @monitor_thread ||= begin
+        RemoteService.logger.info "WORKER POOL - MONITOR INTERVAL: #{@monitor_interval}s"
+        Thread.new do
+          loop do
+            RemoteService.logger.info "WORKER POOL - WAITING: #{queue.size}"
+            sleep(@monitor_interval)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/remote_service.rb

@@ -2,6 +2,7 @@ require "remote_service/version"
 require "remote_service/errors"
 require "remote_service/util/lock"
 require "remote_service/connector/nats"
+require "remote_service/worker_pool"
 require "remote_service/queue"
 require "remote_service/call"
 require "remote_service/base"
@@ -13,7 +14,7 @@ module RemoteService
   extend self
   attr_writer :logger
 
-  def connect(brokers, &block)
+  def connect(brokers:, &block)
     queue = Queue.instance
     queue.connect(brokers, &block)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_service
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Marek Galovic
@@ -102,7 +102,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -124,6 +126,7 @@ files:
 - lib/remote_service/service.rb
 - lib/remote_service/util/lock.rb
 - lib/remote_service/version.rb
+- lib/remote_service/worker_pool.rb
 - remote_service.gemspec
 homepage: https://github.com/marekgalovic/ruby-remote-service
 licenses: