subserver 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a000b5012eabb4cb6dd63890ebcfd6c7fb114fd
-  data.tar.gz: ad5e305ef09bf8695711265cb5ef97b9b7e88ccb
+  metadata.gz: 024346e0b4fd27cc57e916d853d39b08de68d29f
+  data.tar.gz: d697e91f0fa56888c6a601fc58c66631fb64e61f
 SHA512:
-  metadata.gz: 91bc0892c40cabfc4e45f18bc077c6c3d14febd0f16ee0ad971efd9122923881bb3a54c6067c3d480893802076977ca2a3bb3b5a567296bba685984249d26e2b
-  data.tar.gz: 1df78a378a6990db9597e49a55b7f4719597eae63d714f292552e13e14de5cbd10b8741b43b671144713f9b8c674aaaad193fac4dee82e556d00a4b6eff1341d
+  metadata.gz: 0a3eaddf316cfe3910c59dde627db754e9f53941bf6614cf4e6fd2ce56f312dc1485eb1bcfef3af406fffd3ea6dcf6b10cc289be104a7ce138b9aa75e969392a
+  data.tar.gz: 64b24f88d670664662b2ee7eea621d3ef3aa19d4c8e8ca6f84b4489c7140afad07c031adb59587a20af6a0c7ea9128c7d0c0d348cd844beaeb4df0a80c728bef

data/lib/subserver/cli.rb

@@ -68,6 +68,26 @@ module Subserver
       # Touch middleware so it isn't lazy loaded by multiple threads.
       Subserver.middleware
 
+      # Test Pubsub Connection
+      if ENV['PUBSUB_EMULATOR_HOST']
+        uri = URI.parse("http://#{ENV['PUBSUB_EMULATOR_HOST']}")
+        http = Net::HTTP.new(uri.host, uri.port)
+        begin
+          response = http.request_get(uri)
+        rescue Errno::ECONNREFUSED
+          logger.error "Errno::ECONNREFUSED - Could not connect to Pubsub Emulator at connection: #{ENV['PUBSUB_EMULATOR_HOST']}."
+          logger.info "If you are not intending to connect to the Pubsub Emulator remove the PUBSUB_EMULATOR_HOST environment variable."
+          die(1)
+        end
+      else
+        begin
+          client = Subserver::Pubsub.client
+        rescue StandardError => e
+          logger.error "Pubsub Connection Error: #{e.message}"
+          die(1)
+        end
+      end
+
       # Before this point, the process is initializing with just the main thread.
       # Starting here the process will now have multiple threads running.
       fire_event(:startup, reverse: false, reraise: true)
@@ -263,26 +283,6 @@ module Subserver
         die(1)
       end
 
-      # Test Pubsub Connection
-      if ENV['PUBSUB_EMULATOR_HOST']
-        uri = URI.parse("http://#{ENV['PUBSUB_EMULATOR_HOST']}")
-        http = Net::HTTP.new(uri.host, uri.port)
-        begin
-          response = http.request_get(uri)
-        rescue Errno::ECONNREFUSED
-          logger.error "Errno::ECONNREFUSED - Could not connect to Pubsub Emulator at connection: #{ENV['PUBSUB_EMULATOR_HOST']}."
-          logger.info "If you are not intending to connect to the Pubsub Emulator remove the PUBSUB_EMULATOR_HOST environment variable."
-          die(1)
-        end
-      else
-        begin
-          client = Subserver::Pubsub.client
-        rescue StandardError => e
-          logger.error "Pubsub Connection Error: #{e.message}"
-          die(1)
-        end
-      end
-
       raise ArgumentError, "#{timeout}: #{options[:timeout]} is not a valid value" if options.has_key?(:timeout) && options[:timeout].to_i <= 0
     end
 
@@ -335,8 +335,8 @@ module Subserver
           opts[:logfile] = arg
         end
 
-        o.on '-P', '--pidfile PATH', "path to pidfile" do |arg|
-          opts[:pidfile] = arg
+        o.on '-P', '--port PORT', "port to expose health check on" do |arg|
+          opts[:health_port] = arg
         end
 
         o.on '-V', '--version', "Print version and exit" do |arg|

data/lib/subserver/health.rb

@@ -6,11 +6,12 @@ module Subserver
     attr_accessor :server
 
     def initialize
-      @server = TCPServer.new 4481   
+      @server = TCPServer.new Subserver.options[:health_port] || 4081
     end
 
-    def start  
+    def start
       begin
+        logger.debug "Health check avalible on port #{@server.addr[1]}"
         while session = @server.accept
           request = session.gets
 
@@ -29,5 +30,9 @@ module Subserver
     def stop
       @server.close
     end 
+
+    def logger
+      Subserver.logger
+    end
   end
 end 

data/lib/subserver/listener.rb

@@ -29,7 +29,7 @@ module Subserver
 
     def initialize(mgr, subscriber)
       @mgr = mgr
-      @down = false
+      @valid = true
       @done = false
       @thread = nil
       @reloader = Subserver.options[:reloader]
@@ -63,14 +63,18 @@ module Subserver
       @thread ||= safe_thread("listener", &method(:run))
     end
 
+    def valid?
+      @valid
+    end
+
     private unless $TESTING
 
     def retrive_subscrption
       subscription_name = @subscriber.get_subserver_options[:subscription]
-      begin
-        subscription = Pubsub.client.subscription subscription_name
-      rescue Google::Cloud::Error => e
-        raise ArgumentError, "Invalid Subscription name: #{subscription_name} Please ensure your Pubsub subscription exists."
+      subscription = Pubsub.client.subscription subscription_name rescue nil
+      if subscription.nil?
+        logger.error "ArgumentError: Invalid Subscription name: #{subscription_name} in subscriber #{@subscriber.name}. Please ensure your Pubsub subscription exists."
+        @valid = false
       end
       subscription
     end

data/lib/subserver/manager.rb

@@ -25,6 +25,7 @@ module Subserver
 
     attr_reader :listeners
     attr_reader :options
+    attr_reader :subscribers
 
     def initialize(options={})
       logger.debug { options.inspect }
@@ -37,6 +38,8 @@ module Subserver
         @listeners << Listener.new(self, subscriber)
       end
 
+      @listeners.select!{ |l| l.valid? }
+
       @plock = Mutex.new
     end
 
@@ -92,14 +95,15 @@ module Subserver
     end
 
     def listener_died(listener, subscriber, reason)
-      @plock.synchronize do
-        @listeners.delete(listener)
-        unless @done
-          l = Listener.new(self, subscriber)
-          @listeners << l
-          l.start
-        end
-      end
+      logger.warn("Listener for #{subscriber.name} Died at #{Time.now}: #{reason}")
+      # @plock.synchronize do
+      #   @listeners.delete(listener)
+      #   unless @done
+      #     l = Listener.new(self, subscriber)
+      #     @listeners << l
+      #     l.start
+      #   end
+      # end
     end
 
     def stopped?
@@ -134,17 +138,14 @@ module Subserver
       # Expand Subscriber Directory from relative require 
       path = File.expand_path("#{options[:subscriber_dir]}/*.rb")
 
-      # Load existing set of classes
-      existing_classes = ObjectSpace.each_object(Class).to_a
-
       # Require all subscriber files
       Dir[path].each { |f| require f } 
 
-      # Create set with only newly created classes from require loop
-      new_classes = ObjectSpace.each_object(Class).to_a - existing_classes
+      # Create set of all classes including those in require loop
+      classes = ObjectSpace.each_object(Class).to_a
 
       # Only included named classes that have included the Subscriber module
-      subscribers = new_classes.select do |klass|
+      subscribers = classes.select do |klass|
         klass.name && klass < ::Subserver::Subscriber && options[:queues].include?(klass.subserver_options[:queue])
       end
     end

data/lib/subserver/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Subserver
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subserver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Scott Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-pubsub