fiber_connection_pool 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 340c349ed71fd516c16b2ec7ff01b6de4fb65072
+  data.tar.gz: 31d1a2a20a195afa721c39ee2c8a65171fc0f8a2
+SHA512:
+  metadata.gz: 23daf95d4cb681737c91c94172503be106ea0f518ab26f140025c840367fc92abcc922089a46cc3e5c6844f87458da0a03e4f4dc0835d9defadbf3e987e2a8db
+  data.tar.gz: 269f02b50cda24eb6a0e23e683ee74060d4c57de74ed1e3827349c01872df0e89e802211c256fb152714e7ccb6a50dbedc67a237c9e154dfb5b6326ec848a0be

data/examples/goliath_server_em_mongo/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gem 'goliath'
+gem 'em-synchrony'
+gem 'em-mongo'
+gem 'bson_ext'
+gem 'fiber_connection_pool'

data/examples/goliath_server_em_mongo/config/main.rb

@@ -0,0 +1,8 @@
+require 'fiber_connection_pool'
+require 'em-mongo'
+require 'em-synchrony'
+require 'em-synchrony/em-mongo'
+
+config['db'] = FiberConnectionPool.new(:size => 5) do
+                 EM::Mongo::Connection.new.db('bogusdb')
+               end

data/examples/goliath_server_em_mongo/main.rb

@@ -0,0 +1,13 @@
+require 'goliath'
+require 'fiber'
+
+class Main < Goliath::API
+
+  def response(env)
+    print '.'
+    res = db.collection('bogus').find( :$where => "sleep(2000)" )
+    puts "Done #{Thread.current.to_s}, #{Fiber.current.to_s} res:#{res.inspect}"
+    [200,{"Content-Type" => "text/html"},"hello, world! #{Time.now.strftime('%T')}"]
+  end
+
+end

data/examples/goliath_server_mongo/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gem 'goliath'
+gem 'em-synchrony'
+gem 'mongo'
+gem 'fiber_connection_pool'

data/examples/goliath_server_mongo/config/main.rb

@@ -0,0 +1,10 @@
+require 'fiber_connection_pool'
+require 'mongo'
+require 'em-synchrony'
+#require 'em-synchrony/mongo'
+
+require './mongo-em-patch.rb'
+
+config['db'] = FiberConnectionPool.new(:size => 5) do
+                 Mongo::Connection.new.db('bogusdb')
+               end

data/examples/goliath_server_mongo/main.rb

@@ -0,0 +1,13 @@
+require 'goliath'
+require 'fiber'
+
+class Main < Goliath::API
+
+  def response(env)
+    print '.'
+    res = db.collection('bogus').find( :$where => "sleep(2000)" ).count
+    puts "Done #{Thread.current.to_s}, #{Fiber.current.to_s} res:#{res.inspect}"
+    [200,{"Content-Type" => "text/html"},"hello, world! #{Time.now.strftime('%T')}"]
+  end
+
+end

data/examples/goliath_server_mongo/mongo-em-patch.rb

@@ -0,0 +1,85 @@
+require 'fiber'
+
+class EventMachine::Synchrony::MongoTimeoutHandler
+  def self.timeout(op_timeout, ex_class, &block)
+    f = Fiber.current
+    timer = EM::Timer.new(op_timeout) { f.resume(nil) }
+    res = block.call
+    timer.cancel
+    res
+  end
+end
+
+class Mongo::Connection
+  Mutex = ::EventMachine::Synchrony::Thread::Mutex
+end
+
+class Mongo::MongoClient
+  ConditionVariable = ::EventMachine::Synchrony::Thread::ConditionVariable
+  Timeout = ::EventMachine::Synchrony::MongoTimeoutHandler
+end
+
+class Mongo::Pool
+  ConditionVariable = ::EventMachine::Synchrony::Thread::ConditionVariable
+  Mutex = ::EventMachine::Synchrony::Thread::Mutex
+end
+
+class Mongo::Node
+  Mutex = ::EventMachine::Synchrony::Thread::Mutex
+  Timeout = ::EventMachine::Synchrony::MongoTimeoutHandler
+end
+
+class Mongo::TCPSocket
+  Timeout = ::EventMachine::Synchrony::MongoTimeoutHandler
+end
+
+class Mongo::SSLSocket
+  Timeout = ::EventMachine::Synchrony::MongoTimeoutHandler
+end
+
+class Mongo::MongoReplicaSetClient
+  Mutex = ::EventMachine::Synchrony::Thread::Mutex
+end
+
+class Mongo::MongoShardedClient
+  Mutex = ::EventMachine::Synchrony::Thread::Mutex
+end
+
+class Mongo::PoolManager
+  Mutex = ::EventMachine::Synchrony::Thread::Mutex
+end
+
+class Mongo::TCPSocket
+
+  def initialize(host, port, op_timeout=nil, connect_timeout=nil, opts={})
+    @op_timeout      = op_timeout || 30
+    @connect_timeout = connect_timeout || 30
+    @pid             = Process.pid
+
+    # TODO: Prefer ipv6 if server is ipv6 enabled
+    @address = Socket.getaddrinfo(host, nil, Socket::AF_INET).first[3]
+    @port    = port
+
+    @socket = nil
+    connect
+  end
+
+  def connect
+    ::EventMachine::Synchrony::MongoTimeoutHandler.timeout(@connect_timeout, Mongo::ConnectionTimeoutError) do
+      @socket = EM::Synchrony::TCPSocket.new(@address, @port)
+    end
+  end
+
+  def send(data)
+    raise SocketError, 'Not connected yet' if not @socket
+    @socket.write(data)
+  end
+
+  def read(maxlen, buffer)
+    raise SocketError, 'Not connected yet' if not @socket
+    ::EventMachine::Synchrony::MongoTimeoutHandler.timeout(@op_timeout, Mongo::OperationTimeout) do
+      @socket.read(maxlen, buffer)
+    end
+  end
+
+end

data/examples/reel_server_mongo/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'celluloid', github: 'celluloid/celluloid', branch: 'master'
+gem 'celluloid-io', github: 'celluloid/celluloid-io', branch: 'master'
+gem 'reel', github: 'celluloid/reel', branch: 'master'
+gem 'mongo'
+gem 'fiber_connection_pool'
+gem 'em-synchrony'

data/examples/reel_server_mongo/main.rb

@@ -0,0 +1,67 @@
+require 'reel'
+require 'mongo'
+require 'fiber'
+require 'fiber_connection_pool'
+require 'celluloid/autostart'
+
+class Dispatcher
+  include Celluloid::IO
+
+  def initialize(opts = {})
+    @db_pool_size = opts[:db_pool_size] || 5
+    @pool = FiberConnectionPool.new(:size => @db_pool_size) do
+      Mongo::MongoClient.new.db('bogusdb')
+    end
+    puts "DB Pool of size #{@db_pool_size} ready..."
+  end
+
+  def dispatch(request)
+    print '.'
+    id = @pool.collection("bogus").find({ :$where => 'sleep(2000)' }).count
+    puts "Done #{Thread.current.to_s}, #{Fiber.current.to_s}"
+    request.respond :ok, "hello, world! #{Time.now.strftime('%T')}"
+  end
+end
+
+
+class DispatcherPool
+
+  def initialize(opts = {})
+    @size = opts[:size] || 1
+    @dispatchers = []
+    @size.times{ |i| @dispatchers << "dispatcher_#{i}".to_sym }
+    @dispatchers.each{ |d| Dispatcher.supervise_as d }
+    @next_dispatcher = 0
+    puts "Pool of #{@size} dispatchers ready."
+  end
+
+  def dispatch(request)
+    d = @next_dispatcher
+    @next_dispatcher += 1
+    @next_dispatcher = 0 if @next_dispatcher >= @dispatchers.count
+    Celluloid::Actor[@dispatchers[d]].dispatch(request)
+  rescue => ex
+    puts "Someone died: #{ex}"
+    request.respond :internal_server_error, "Someone died"
+  end
+
+end
+
+
+class MyServer < Reel::Server
+
+  def initialize(host = "127.0.0.1", port = 3000)
+    super(host, port, &method(:on_connection))
+    @dispatcher = DispatcherPool.new
+    puts "Listening on #{host}:#{port}..."
+  end
+
+  def on_connection(connection)
+    while request = connection.request
+      @dispatcher.dispatch(request)
+    end
+  end
+
+end
+
+MyServer.run

data/lib/fiber_connection_pool.rb

@@ -2,7 +2,7 @@ require 'fiber'
 require_relative 'fiber_connection_pool/exceptions'
 
 class FiberConnectionPool
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 
   RESERVED_TTL_SECS = 30 # reserved cleanup trigger
   SAVED_DATA_TTL_SECS = 30 # saved_data cleanup trigger
@@ -127,7 +127,7 @@ class FiberConnectionPool
     new_conn = yield bad_conn
     @available.reject!{ |v| v == bad_conn }
     @reserved.reject!{ |k,v| v == bad_conn }
-    @available.push new_conn
+    @available.unshift new_conn
     # try to cleanup
     begin
       bad_conn.close
@@ -210,7 +210,7 @@ class FiberConnectionPool
   # Also perform cleanup if TTL is past
   #
   def release(fiber)
-    @available.push @reserved.delete(fiber)
+    @available.unshift @reserved.delete(fiber)
 
     # try cleanup
     reserved_cleanup if (Time.now - @last_reserved_cleanup) >= RESERVED_TTL_SECS

data/test/fiber_connection_pool_test.rb

@@ -25,7 +25,7 @@ class TestFiberConnectionPool < Minitest::Test
     # we should have visited 1 thread, 15 fibers and 1 instances
     assert_equal 1, info[:threads].count
     assert_equal 15, info[:fibers].count
-    assert_equal 1, info[:instances].count
+    assert_equal 5, info[:instances].count
   end
 
   def test_em_synchrony_behaviour

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fiber_connection_pool
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Ruben Caro
@@ -10,43 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "Fiber-based generic connection pool for Ruby, allowing\n                  non-blocking
-  IO behaviour on the same thread\n                  as provided by EventMachine or
-  Celluloid."
+description: |-
+  Fiber-based generic connection pool for Ruby, allowing
+                    non-blocking IO behaviour on the same thread
+                    as provided by EventMachine or Celluloid.
 email:
 - ruben.caro@lanuez.org
 executables: []
@@ -63,8 +59,17 @@ files:
 - examples/goliath_server/Gemfile
 - examples/goliath_server/config/main.rb
 - examples/goliath_server/main.rb
+- examples/goliath_server_em_mongo/Gemfile
+- examples/goliath_server_em_mongo/config/main.rb
+- examples/goliath_server_em_mongo/main.rb
+- examples/goliath_server_mongo/Gemfile
+- examples/goliath_server_mongo/config/main.rb
+- examples/goliath_server_mongo/main.rb
+- examples/goliath_server_mongo/mongo-em-patch.rb
 - examples/reel_server/Gemfile
 - examples/reel_server/main.rb
+- examples/reel_server_mongo/Gemfile
+- examples/reel_server_mongo/main.rb
 - fiber_connection_pool.gemspec
 - lib/fiber_connection_pool.rb
 - lib/fiber_connection_pool/exceptions.rb
@@ -73,27 +78,26 @@ files:
 homepage: https://github.com/rubencaro/fiber_connection_pool
 licenses:
 - GPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fiber-based generic connection pool for Ruby
 test_files:
 - test/fiber_connection_pool_test.rb