pg_notifier 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmZlMmY5YjE5MzVhMjI1NjljZGVkZTU2NGUwYjA2MGFmMGRmZDcxNg==
+    MTA3MzYyYTM0ODk3MDlkMmU2NjA1ODEyOGYyMjg4NTNiMmZjNmZlYg==
   data.tar.gz: !binary |-
-    ZjRkYjU1MjM4Zjk4ZTUzOGYxZjg4YmFkMTAyYmIyNWFhZDYyZDM5Yw==
+    MjJiODFhNmUxODk5NDc2NDIyYjRmNWU1NGQzZjg3YjY3YTU2NGQ5MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmM5MTA3M2ZjZWU3NjJmZDkyMWMyNmM0OTZiYmRhMzBlNzM3NGVlYWM1OWNl
-    ZWRjZGNjZTljNDA3Zjk0YTdkODhkOGIyNWY4Y2M2MDBkMmI5ZmNiYjQyNzU2
-    NTZiNzI0YjY2ZDI4NDUxMjk1YzdmMmQxYjBmODgxYjczODUwYWU=
+    ZGI1ZmZjMDViMzRhM2U2ZTJjZTBiYTk5MTE2Y2VkMWJhOTI0OGNkN2U4MGY5
+    Yjk5MjE5ZDhiNDEzYmU5ZWVhNWI3ODNlMmRmODQ1NzRlMTk1YzhkMGZjMTNi
+    ZTc2OTY4NDgwODJhNTdjNzI0Yzk2MTA3MjU3OWJlYmEyYzk3OWE=
   data.tar.gz: !binary |-
-    Yzg3NjE3YmM3MjRmYTgyNTUzMDkyOTczY2VkMjYyYTM4NzQ2NDUzYWI2YWYy
-    MmJiZWFjNzg5OWE0ZGJkOWNlMDZmMTAzOTA1MWU4NTlhOTQ4OTg3ZmNhYTNl
-    ZTlhMjcyODZhYWZmNzE0N2FkMTExMzBjNmFiM2QyYmFlOTcyZDU=
+    ODhkNDk5NzM1YjViYjc2ZTJkYzg5NDI4Y2IzOTkwZWIyMTVlMTQ3ODU5NDFh
+    MzRjYzI5MTAwNzdiNDZmMWZkODU2MDE3MDhmYWU2ZWZiZmRiYmQxNjUxODNm
+    ZGI2MDJmYzBiYmQ4YWZhN2U5NzljM2IzN2ZmMWI5NDgxNjFjYTI=

data/lib/pg_notifier.rb

@@ -10,7 +10,22 @@ module PgNotifier
     end
 
     def run
+      sig_read, sig_write = IO.pipe
+
+      (%w[INT TERM HUP] & Signal.list.keys).each do |sig|
+        trap sig do
+          sig_write.puts(sig)
+        end
+      end
+
       manager.run
+
+      while io = IO.select([sig_read])
+        sig = io.first[0].gets.chomp
+
+        manager.logger.debug "Got #{sig} signal"
+        manager.shutdown if %w[INT TERM HUP].include? sig
+      end
     end
 
     def notify(channel, options = {}, &block)

data/lib/pg_notifier/manager.rb

@@ -4,14 +4,17 @@ require 'logger'
 
 module PgNotifier
   class Manager
-    attr_accessor :logger, :db_config
+    attr_accessor :logger, :db_config, :timeout
 
     def initialize(attrs = {})
       @logger = attrs.fetch :logger, Logger.new(STDOUT)
       @db_config = attrs.fetch :db_config , {}
+      @timeout = attrs.fetch :timeout, 0.1
 
       @finish = false
       Thread.abort_on_exception = true
+
+      @connection_mutex = Mutex.new
     end
 
     def notify(channel, options = {}, &block)
@@ -34,17 +37,9 @@ module PgNotifier
     def run
       logger.info "Starting pg_notifier for #{channels.count} channels: [ #{channels.join(' ')} ]"
 
-      sig_read, sig_write = IO.pipe
-
-      (%w[INT TERM HUP] & Signal.list.keys).each do |sig|
-        trap sig do
-          sig_write.puts(sig)
-        end
-      end
-
       Thread.new do
         channels.each do |channel|
-          pg_result = connection.exec "LISTEN #{channel};"
+          pg_result = @connection_mutex.synchronize { connection.exec "LISTEN #{channel};" }
 
           unless pg_result.result_status.eql? PG::PGRES_COMMAND_OK
             raise ChannelNotLaunched, "Channel ##{channel} not launched"
@@ -52,40 +47,39 @@ module PgNotifier
         end
 
         until @finish do
-          connection.wait_for_notify do |channel, pid, payload|
-            logger.info "Notifying channel: #{channel}, pid: #{pid}, payload: #{payload}"
+          if notification = wait_notification()
+            logger.info "Notifying channel: %s, pid: %s, payload: %s" % notification
 
-            subscriptions = subscriptions_by_channels.fetch channel, []
-            subscriptions.each { |subscription| subscription.notify(channel, pid, payload) }
+            subscriptions = subscriptions_by_channels.fetch notification.first, []
+            subscriptions.each { |subscription| subscription.notify(*notification) }
           end
         end
       end
-
-      while io = IO.select([sig_read])
-        sig = io.first[0].gets.chomp
-        handle_signal(sig)
-      end
-    end
-
-    def handle_signal(sig)
-      logger.debug "Got #{sig} signal"
-
-      shutdown if %w[INT TERM HUP].include? sig
     end
 
     def shutdown
       logger.info 'Shutting down'
 
       @finish = true
-      unless connection.finished?
-        channels.each do |channel|
-          connection.exec "UNLISTEN #{channel};"
-        end
 
-        connection.finish
+      @connection_mutex.synchronize do
+        unless connection.finished?
+          connection.async_exec "UNLISTEN *;"
+          connection.finish
+        end
       end
 
       exit(0)
     end
+
+    private
+
+    def wait_notification
+      @connection_mutex.synchronize do
+        connection.wait_for_notify(timeout) do |channel, pid, payload|
+          return [channel, pid, payload]
+        end
+      end
+    end
   end
 end

data/lib/pg_notifier/version.rb

@@ -1,3 +1,3 @@
 module PgNotifier
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_notifier
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - German Antsiferov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg