pg_notifier 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDQ3YjdhYWExNjMzZjNhZTBhMWE5ZmQ1ZTU0NGU3YTNhMzY2MmQyZA==
+    MmZlMmY5YjE5MzVhMjI1NjljZGVkZTU2NGUwYjA2MGFmMGRmZDcxNg==
   data.tar.gz: !binary |-
-    MWQ4MzkzNzNkOGJjZDQ2MmMzYzc4ZTcxZWJjZmFjOTBiMzA3MjMzNA==
+    ZjRkYjU1MjM4Zjk4ZTUzOGYxZjg4YmFkMTAyYmIyNWFhZDYyZDM5Yw==
 SHA512:
   metadata.gz: !binary |-
-    YWU5ZGNiNDBhMmMzN2U1YTdiN2E1YTg4MDE5NGQ5MTQ5NjRiM2I4MWJiM2M0
-    YTgzMzdlYjBjYjA3M2RmMzAwZTEzZmY3N2ExZjQzYjQ5ODFiNjQ3MDQxZTVl
-    YTUyNjQxOWI4NDM3NzIwYjgzN2JiMjAwODU1MzRlOWFkNDNlMDU=
+    ZmM5MTA3M2ZjZWU3NjJmZDkyMWMyNmM0OTZiYmRhMzBlNzM3NGVlYWM1OWNl
+    ZWRjZGNjZTljNDA3Zjk0YTdkODhkOGIyNWY4Y2M2MDBkMmI5ZmNiYjQyNzU2
+    NTZiNzI0YjY2ZDI4NDUxMjk1YzdmMmQxYjBmODgxYjczODUwYWU=
   data.tar.gz: !binary |-
-    YjkwNDUzN2E4ODg2N2U4ZWEwYTRiMDI1M2U1NzQ3MDJkZTRhYjcwZjY0NGZh
-    MjkwMTNkNTllMDY0NDE4ZDMwOGUzY2E3N2M5ODVhZjM4NWY2NGE3MTgwZjUz
-    NDJjODUyODI1ZGNmNzIxYWE0ZThiNmY3ZTQ0NDMzZWQ0OTZjOTI=
+    Yzg3NjE3YmM3MjRmYTgyNTUzMDkyOTczY2VkMjYyYTM4NzQ2NDUzYWI2YWYy
+    MmJiZWFjNzg5OWE0ZGJkOWNlMDZmMTAzOTA1MWU4NTlhOTQ4OTg3ZmNhYTNl
+    ZTlhMjcyODZhYWZmNzE0N2FkMTExMzBjNmFiM2QyYmFlOTcyZDU=

data/README.md

@@ -20,7 +20,6 @@ require 'pg_notifier'
 module PgNotifier
   configure do |notifier|
     notifier.logger = Logger.new('/var/log/pg_notifier.log')
-    notifier.timeout = 1
     notifier.db_config = {
       host: 'localhost',
       port: 5432,

data/lib/pg_notifier/manager.rb

@@ -4,17 +4,13 @@ require 'logger'
 
 module PgNotifier
   class Manager
-    attr_accessor :logger, :db_config, :timeout
+    attr_accessor :logger, :db_config
 
     def initialize(attrs = {})
       @logger = attrs.fetch :logger, Logger.new(STDOUT)
       @db_config = attrs.fetch :db_config , {}
-      @timeout = attrs.fetch :timeout, 1
 
       @finish = false
-      @mutex = Mutex.new
-      @resource = ConditionVariable.new
-
       Thread.abort_on_exception = true
     end
 
@@ -55,16 +51,12 @@ module PgNotifier
           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
+        until @finish do
+          connection.wait_for_notify do |channel, pid, payload|
+            logger.info "Notifying channel: #{channel}, pid: #{pid}, payload: #{payload}"
 
-            @resource.wait @mutex, timeout
+            subscriptions = subscriptions_by_channels.fetch channel, []
+            subscriptions.each { |subscription| subscription.notify(channel, pid, payload) }
           end
         end
       end
@@ -78,26 +70,13 @@ module PgNotifier
     def handle_signal(sig)
       logger.debug "Got #{sig} signal"
 
-      case sig
-      when 'INT'
-        shutdown
-      when 'TERM'
-        graceful_shutdown
-      when 'HUP'
-        graceful_shutdown
-      end
+      shutdown if %w[INT TERM HUP].include? sig
     end
 
     def shutdown
       logger.info 'Shutting down'
 
       @finish = true
-      close_connection
-
-      exit(0)
-    end
-
-    def close_connection
       unless connection.finished?
         channels.each do |channel|
           connection.exec "UNLISTEN #{channel};"
@@ -105,17 +84,6 @@ module PgNotifier
 
         connection.finish
       end
-    end
-
-    def graceful_shutdown
-      logger.info 'Gracefully shutting down'
-
-      @finish = true
-
-      @mutex.synchronize do
-        close_connection
-        @resource.signal
-      end
 
       exit(0)
     end

data/lib/pg_notifier/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_notifier
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - German Antsiferov