pg_notifier 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTRmMzM3NjRjMTE2YjljYmYzZWQ2ODFmMmRiNTc0YWNjMDFmZDQ5Mg==
+    MDQ3YjdhYWExNjMzZjNhZTBhMWE5ZmQ1ZTU0NGU3YTNhMzY2MmQyZA==
   data.tar.gz: !binary |-
-    YTQ5MWUxYzI0MzM0MjMzMTk0NGZlZWVlNGFjNDRiODI4M2Y4OWExOA==
+    MWQ4MzkzNzNkOGJjZDQ2MmMzYzc4ZTcxZWJjZmFjOTBiMzA3MjMzNA==
 SHA512:
   metadata.gz: !binary |-
-    ZGU4MWNlNWFlNTY3NTI0ODI2OWQ4MzAwZjVmMDg2NjNmYzU0MzBmMzQ1ODY1
-    YWQ1MTZiMjZkZTQxMzM3MGQxZTRlZTQ5YWYyYWNmY2JhOWViYTIxY2M4YTFh
-    YWI1MDQ0MmE1MmI3Nzg1NjE3OGM1ZmU2NjVmYjExNzdiNTU1OGE=
+    YWU5ZGNiNDBhMmMzN2U1YTdiN2E1YTg4MDE5NGQ5MTQ5NjRiM2I4MWJiM2M0
+    YTgzMzdlYjBjYjA3M2RmMzAwZTEzZmY3N2ExZjQzYjQ5ODFiNjQ3MDQxZTVl
+    YTUyNjQxOWI4NDM3NzIwYjgzN2JiMjAwODU1MzRlOWFkNDNlMDU=
   data.tar.gz: !binary |-
-    NzczNDUzMTRkOWZjNWM4OGNlNzhkZDA3MDIzYTU4NzNmMmI4NTQ2OGMyNTI5
-    MDA4NjQyMjMxNjExNTVlMWNlNGQ4MTRhZDA0YTRlOWMzZTVhMjkzZmI3ZDY3
-    MGQzNGNmMTgzODg1N2EzMjU1MWRiZWE2NTQ1NDY4OGU3ZDM0OGY=
+    YjkwNDUzN2E4ODg2N2U4ZWEwYTRiMDI1M2U1NzQ3MDJkZTRhYjcwZjY0NGZh
+    MjkwMTNkNTllMDY0NDE4ZDMwOGUzY2E3N2M5ODVhZjM4NWY2NGE3MTgwZjUz
+    NDJjODUyODI1ZGNmNzIxYWE0ZThiNmY3ZTQ0NDMzZWQ0OTZjOTI=

data/lib/pg_notifier.rb

@@ -1,4 +1,5 @@
 require "pg_notifier/version"
+require "pg_notifier/errors"
 require "pg_notifier/subscription"
 require "pg_notifier/manager"
 

data/lib/pg_notifier/errors.rb

@@ -0,0 +1,4 @@
+module PgNotifier
+  class PgNotifierError < StandardError; end
+  class ChannelNotLaunched < PgNotifierError; end
+end

data/lib/pg_notifier/manager.rb

@@ -14,6 +14,8 @@ module PgNotifier
       @finish = false
       @mutex = Mutex.new
       @resource = ConditionVariable.new
+
+      Thread.abort_on_exception = true
     end
 
     def notify(channel, options = {}, &block)
@@ -47,11 +49,17 @@ module PgNotifier
       Thread.new do
         channels.each do |channel|
           pg_result = connection.exec "LISTEN #{channel};"
+
+          unless pg_result.result_status.eql? PG::PGRES_COMMAND_OK
+            raise ChannelNotLaunched, "Channel ##{channel} not launched"
+          end
         end
 
         @mutex.synchronize do
           until @finish do
             connection.wait_for_notify do |channel, pid, payload|
+              logger.info "Notifying channel: #{channel}, pid: #{pid}, payload: #{payload}"
+
               subscriptions = subscriptions_by_channels.fetch channel, []
               subscriptions.each { |subscription| subscription.notify(channel, pid, payload) }
             end
@@ -84,18 +92,28 @@ module PgNotifier
       logger.info 'Shutting down'
 
       @finish = true
-      connection.finish unless connection.finished?
+      close_connection
 
       exit(0)
     end
 
+    def close_connection
+      unless connection.finished?
+        channels.each do |channel|
+          connection.exec "UNLISTEN #{channel};"
+        end
+
+        connection.finish
+      end
+    end
+
     def graceful_shutdown
       logger.info 'Gracefully shutting down'
 
       @finish = true
 
       @mutex.synchronize do
-        connection.finish unless connection.finished?
+        close_connection
         @resource.signal
       end
 

data/lib/pg_notifier/version.rb

@@ -1,3 +1,3 @@
 module PgNotifier
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_notifier
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - German Antsiferov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -86,6 +86,7 @@ files:
 - bin/pg_notifier
 - bin/setup
 - lib/pg_notifier.rb
+- lib/pg_notifier/errors.rb
 - lib/pg_notifier/manager.rb
 - lib/pg_notifier/subscription.rb
 - lib/pg_notifier/version.rb