action_subscriber 2.1.2-java → 2.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f7cb8c3f5be3679d9626c67fe5778869efa7ec2
-  data.tar.gz: 91024f89d188ef02703468d24711c47c073eee20
+  metadata.gz: c9958787beb51135b66b1c55da8e5c361e0dc52d
+  data.tar.gz: 60ae57496371855cf7107ffe85c0835bd6444f64
 SHA512:
-  metadata.gz: cc9301af401082e92f3d5e3930e0de5e1aaa4bac0d581c4646c27ea8f20f7ef38e0c963c1038677abb966035aa5996b749fde7934bfce039143de9cfe2ecb0f8
-  data.tar.gz: 160e1bac79273ea4af61819402b6f789b820ce307ab4d2011a2fedd347c00c5e76cabd98646433191597f85881aae1a36ea68c59dfd4724f8c425bd93f51e056
+  metadata.gz: fd3530b49d2c228baa00efc4d5b468b6288dedba99b47777047743148616647fd5a126d7fba793a648a322b88e2739c750240cf07ad0dfc9064e5e4cdc17e449
+  data.tar.gz: dbf7288f4e2a7fe760ad1d9a1559b2d3c9d73eb4cd4a40b26d60e3f6789294f7282833268386ffc01a477e78a75c92f9a43635b1c741fbea3aa28aa97503b866

data/bin/action_subscriber

@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
 
+$ACTION_SUBSCRIBER_SERVER_MODE = true
+
 require 'active_support'
 require 'active_support/core_ext'
 require 'thor'
+require 'action_subscriber'
 
 module ActionSubscriber
   class CLI < ::Thor
@@ -23,12 +26,24 @@ module ActionSubscriber
     BABOUDESC
 
     def start
-      require options[:app]
-
       $0 = "Action Subscriber server #{object_id}"
       ::ActionSubscriber.logger.info "Loading configuration..."
 
       ::ActionSubscriber::Configuration.configure_from_yaml_and_cli(options)
+
+      ::ActionSubscriber.logger.info "Requiring app..."
+
+      require options[:app]
+
+      # We run these outside of lib/action_subscriber.rb because we need to load
+      # our railtie (Rails must be defined) before we can run our load hooks.
+      # When requiring action_subscriber as a client, these will be run
+      # automatically.
+      ::ActionSubscriber.logger.info "Running load hooks..."
+
+      require "action_subscriber/railtie" if defined?(Rails)
+      ::ActiveSupport.run_load_hooks(:action_subscriber, Base)
+
       ::ActionSubscriber.logger.info "Starting server..."
 
       case ::ActionSubscriber.configuration.mode

data/lib/action_subscriber.rb

@@ -114,14 +114,18 @@ module ActionSubscriber
     alias_method :config, :configuration
   end
 
+  # Execution is delayed until after app loads when used with bin/action_subscriber
+  unless $ACTION_SUBSCRIBER_SERVER_MODE
+    ::ActiveSupport.run_load_hooks(:action_subscriber, Base)
+    require "action_subscriber/railtie" if defined?(Rails)
+  end
+
   # Initialize config object
   config
 
   # Intialize async publisher adapter
   ::ActionSubscriber::Publisher::Async.publisher_adapter
 
-  ::ActiveSupport.run_load_hooks(:action_subscriber, Base)
-
   ##
   # Private Implementation
   #
@@ -144,11 +148,8 @@ module ActionSubscriber
     end
   end
   private_class_method :default_routes
-
 end
 
-require "action_subscriber/railtie" if defined?(Rails)
-
 at_exit do
   ::ActionSubscriber::Publisher::Async.publisher_adapter.shutdown!
   ::ActionSubscriber::RabbitConnection.publisher_disconnect!

data/lib/action_subscriber/configuration.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module ActionSubscriber
   class Configuration
     attr_accessor :allow_low_priority_methods,
@@ -24,6 +26,8 @@ module ActionSubscriber
                   :times_to_pop,
                   :virtual_host
 
+    CONFIGURATION_MUTEX = ::Mutex.new
+
     DEFAULTS = {
       :allow_low_priority_methods => false,
       :async_publisher => 'memory',
@@ -51,18 +55,25 @@ module ActionSubscriber
     ##
     # Class Methods
     #
-    def self.configure_from_yaml_and_cli(cli_options = {})
-      env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || ENV["APP_ENV"] || "development"
+    def self.configure_from_yaml_and_cli(cli_options = {}, reload = false)
+      CONFIGURATION_MUTEX.synchronize do
+        @configure_from_yaml_and_cli = nil if reload
+        @configure_from_yaml_and_cli ||= begin
+          env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || ENV["APP_ENV"] || "development"
 
-      yaml_config = {}
-      absolute_config_path = ::File.expand_path(::File.join("config", "action_subscriber.yml"))
-      if ::File.exists?(absolute_config_path)
-        yaml_config = ::YAML.load_file(absolute_config_path, :safe => true)[env]
-      end
+          yaml_config = {}
+          absolute_config_path = ::File.expand_path(::File.join("config", "action_subscriber.yml"))
+          if ::File.exists?(absolute_config_path)
+            yaml_config = ::YAML.load_file(absolute_config_path)[env]
+          end
 
-      ::ActionSubscriber::Configuration::DEFAULTS.each_pair do |key, value|
-        setting = cli_options[key] || yaml_config[key.to_s]
-        ::ActionSubscriber.config.__send__("#{key}=", setting) if setting
+          ::ActionSubscriber::Configuration::DEFAULTS.each_pair do |key, value|
+            setting = cli_options[key] || yaml_config[key.to_s]
+            ::ActionSubscriber.config.__send__("#{key}=", setting) if setting
+          end
+
+          nil
+        end
       end
     end
 

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement