oversip-mod-mysql 0.1.1 → 0.2.0

data/LICENSE

@@ -1,6 +1,6 @@
 Name: oversip-mod-mysql
 Maintainer: Iñaki Baz Castillo <ibc@aliax.net>
-Copyright (c) 2012 Iñaki Baz Castillo <ibc@aliax.net>
+Copyright (c) 2013 Iñaki Baz Castillo <ibc@aliax.net>
 
 
 License: The MIT License

data/README.md

@@ -23,7 +23,7 @@ Creates a MySQL connection pool by receiving a mandatory `options` (a `Hash`) wi
 
 The method allows passing a block which would be later called by passing as argument each generated `Mysql2::EM::Client` instance.
 
-The created connection pool is an instance of [`EventMachine::Synchrony::ConnectionPool`](https://github.com/igrigorik/em-synchrony/blob/master/lib/em-synchrony/connection_pool.rb).
+The created connection pool accepts calls to any method defined for `Mysql2::EM::Client` class instance.
 
 
 ### Method `OverSIP::Modules::Mysql.pool(pool_name)`
@@ -84,22 +84,6 @@ end
 ```
 
 
-## Notes
-
-### SQL queries in events others than OverSIP provides
-
-If you want to place a SQL query within an event different than those provided by OverSIP (i.e. within a EventMachine `add_timer` or `next_tick` callback) then you need to create a Fiber and place the SQL query there (otherwise "can't yield from root fiber" error will occur):
-
-```
-EM.add_periodic_timer(2) do
-  Fiber.new do
-    pool = OverSIP::M::Mysql.pool(:my_db)
-    rows = pool.query "SELECT * FROM users"
-    log_info "online users: #{rows.inspect}"
-  end
-end
-```
-
 ## Limitations
 
 [mysql2](https://github.com/brianmario/mysql2) driver has auto reconnection support (which is forced by `oversip-mod-mysql` by setting the field `options[:reconnect] => true`). Unfortunatelly the auto reconnect feature of `mysql2` driver is blocking which means that, in case the MySQL server goes down, OverSIP will get frozen during the auto reconnection attempt.

data/lib/oversip-mod-mysql.rb

@@ -32,7 +32,24 @@ module OverSIP
 
         ::OverSIP::SystemCallbacks.on_started do
           log_info "Adding MySQL connection pool (name: #{pool_name.inspect}, size: #{pool_size})..."
-          @pools[pool_name] = ::EM::Synchrony::ConnectionPool.new(size: pool_size) do
+          @pools[pool_name] = Pool.new pool_size, options, block
+        end
+      end  # def self.add_pool
+
+      def self.pool pool_name
+        pool = @pools[pool_name]
+        raise ::ArgumentError, "no pool with `name' #{pool_name.inspect}"  unless pool
+        pool
+      end
+      class << self
+        alias :get_pool :pool
+      end
+
+
+      class Pool
+
+        def initialize pool_size, options, block
+          @em_synchrony_connectionpool = ::EM::Synchrony::ConnectionPool.new(size: pool_size) do
             # Avoid the hash to be modified internally.
             options = options.clone
             # Force DB autoreconnect.
@@ -45,16 +62,24 @@ module OverSIP
             conn
           end
         end
-      end  # def self.add_pool
 
-      def self.pool pool_name
-        pool = @pools[pool_name]
-        raise ::ArgumentError, "no pool with `name' #{pool_name.inspect}"  unless pool
-        pool
-      end
-      class << self
-        alias :get_pool :pool
-      end
+        def method_missing method, *args, &blk
+          @em_synchrony_connectionpool.__send__ method, *args, &blk
+        end
+
+        def query *args, &blk
+          # If we are not in the OverSIP Root Fiber then do nothing special.
+          if ::Fiber.current != ::OverSIP.root_fiber
+            @em_synchrony_connectionpool.__send__ :query, *args, &blk
+          # Otherwise run the query within a new Fiber.
+          else
+            ::Fiber.new do
+              @em_synchrony_connectionpool.__send__ :query, *args, &blk
+            end.resume
+          end
+        end
+
+      end  # class Pool
 
     end  # module Mysql
 

data/lib/oversip-mod-mysql/version.rb

@@ -4,8 +4,8 @@ module OverSIP
     module Mysql
       module Version
         MAJOR = 0
-        MINOR = 1
-        TINY  = 1
+        MINOR = 2
+        TINY  = 0
         DEVEL = nil  # Set to nil for stable releases.
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oversip-mod-mysql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oversip
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement