active_pubsub 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4e0a20248f5de90d821e8e07db538c76dd121c
-  data.tar.gz: c3e9ffbf7d9faef44bf37393f38b39cfd3bfd806
+  metadata.gz: 732df7c0baced02169548ca0e1b68fe64672bf98
+  data.tar.gz: dc0e9439ab43e368ebef496cb24a0686e1d6d7e1
 SHA512:
-  metadata.gz: 56af865a31f3bc9939f079c800191f9976a04d5039556d3e7721d74a9a59cda5e9d9560f439ec91fbaec689e0c5ae2f2ad09f5002ccf1cc529c525e009d560fb
-  data.tar.gz: 0604dcb58eec116f71ae5c964d87f5a455c5aae35a2d1708ab5fdeae84aa36028efc45f2557dc2910e10dddc4a5547756f5b30be0aae13e8fe049d210ad63f4b
+  metadata.gz: 1fa9d7aabee001f5a1423d590277d0a6de796d3220f1ffa8c884699343e02689a4fc17fb2b8ef7389446fe7f244aa4566dc306fd22cde720c537b5a94dcdb2e5
+  data.tar.gz: f5068dc1ce77133ca6bbb2574d942be00a1c683c7b967da06465db2e1ecc44a1cedc4d2c78d1797c5762a9e1651ec8196e679ef3e865798c8d094657c1963fb6

data/README.md

@@ -5,6 +5,16 @@ Service oriented observers for active record, via RabbitMQ and Bunny gem. Publis
 Best examples can be found here:
 https://github.com/jasonayre/active_pubsub_examples
 
+### Quick important development/spring bug note ###
+If you are having issues with either publisher or subscribers hanging in development,
+kill spring. Kill it twice actually. Make sure its dead. Then restart with env var
+
+```
+DISABLE_SPRING=1 bx subscriber start
+```
+
+And when running server or console make sure to DISABLE_SPRING=1 as well. (dont know how to treat the problem yet just diagnose the symptom which seems to be spring)
+
 ## Publisher Example
 ``` ruby
 class Post < ::ActiveRecord::Base

data/bin/subscriber

@@ -5,22 +5,53 @@ require 'active_pubsub'
 require './config/environment.rb'
 
 class Subscriber < ::Thor
+  option :address, :type => :string, :default => ENV['RABBITMQ_URL'], :aliases => %w(-a), :desc => "RabbitMQ url. Default is #{ENV['RABBITMQ_URL']}"
+  option :log, :type => :string, :default => ::STDOUT, :aliases => %w(-l), :desc => 'Log file or device. Default is STDOUT.'
+  option :level, :type => :numeric, :default => ::Logger::INFO, :aliases => %w(-v), :desc => 'Log level to use, 0-5 (see http://www.ruby-doc.org/stdlib/libdoc/logger/rdoc/)'
+
   desc "start", "Start ActivePubsub Subscriber"
   def start
-    puts "Starting ActivePubsub Subscriber"
+    merge_config_options!(options)
+    configure_logger
+    configure_traps
+    start_subscribers
+  end
+
+  no_tasks do
+    def configure_logger
+      log_level = options.debug? ? ::Logger::DEBUG : options.level
+      ::ActivePubsub::Logging.initialize_logger(options.log, log_level)
+
+      ::ActivePubsub.config.logger
+    end
 
-    ::ActivePubsub.load_subscribers
+    # Configure signal traps.
+    def configure_traps
+      exit_signals = [:INT, :TERM]
+      exit_signals << :QUIT unless defined?(JRUBY_VERSION)
 
-    ::ActivePubsub.start_subscribers
+      exit_signals.each do |signal|
+        trap(signal) do
+          puts "Stopping Subscribers"
+          exit(0)
+        end
+      end
+    end
 
-    puts "Subscribers Started"
+    def merge_config_options!(options)
+      ::ActivePubsub.config.merge!(options)
+    end
+
+    def start_subscribers
+      ::ActivePubsub.logger.info "Starting Subscribers"
+
+      ::ActivePubsub.load_subscribers
+
+      ::ActivePubsub.start_subscribers
+    end
   end
 end
 
-#todo: write event loop that handles shutdown gracefully
-#however, it seems that Bunny knows when to wake subscribers up
-#so sleeping seems to be enough for now
-
 ::Subscriber.start
 
 sleep

data/lib/active_pubsub/config.rb

@@ -10,6 +10,7 @@ module ActivePubsub
       self[:address] ||= ENV['RABBITMQ_URL']
       self[:publish_as] ||= nil
       self[:service_namespace] ||= nil
+      self[:logger] ||= ::ActivePubsub::Logging.logger
     end
   end
 end

data/lib/active_pubsub/connection.rb

@@ -1,6 +1,5 @@
 require "bunny"
 
-
 module ActivePubsub
   class Connection < Delegator
     attr_accessor :connection, :channel

data/lib/active_pubsub/logging.rb

@@ -0,0 +1,41 @@
+require 'logger'
+
+module ActivePubsub
+  module Logging
+    def self.initialize_logger(log_target=$stdout, log_level=::Logger::INFO)
+      @counter ||= 0
+      @counter = @counter + 1
+      @logger = ::Logger.new(log_target)
+      @logger.level = log_level
+      @logger
+    end
+
+    def self.logger
+      defined?(@logger) ? @logger : initialize_logger
+    end
+
+    def self.logger=(new_logger)
+      @logger = new_logger
+    end
+
+    def logger
+      ::ActivePubsub::Logging.logger
+    end
+
+    def log_exception(ex)
+      logger.error { ex.message }
+      logger.error { ex.backtrace[0..5].join("\n") }
+      logger.debug { ex.backtrace.join("\n") }
+    end
+
+    def log_signature
+      @_log_signature ||= "[#{self.class == Class ? self.name : self.class.name}]"
+    end
+
+    def sign_message(message)
+      "#{log_signature} #{message}"
+    end
+  end
+end
+
+# Inspired by [protobuf](https://github.com/localshred/protobuf)

data/lib/active_pubsub/publishable.rb

@@ -31,18 +31,24 @@ module ActivePubsub
       record_updated_event = ::ActivePubsub::Event.new(self.class.exchange_key, "updated", serialized_resource)
 
       ::ActivePubsub.publish_event(record_updated_event)
+
+      ::ActivePubsub.logger.info(record_updated_event)
     end
 
     def publish_created_event
       record_created_event = ::ActivePubsub::Event.new(self.class.exchange_key, "created", serialized_resource)
 
       ::ActivePubsub.publish_event(record_created_event)
+
+      ::ActivePubsub.logger.info(record_created_event)
     end
 
     def publish_destroyed_event
       record_destroyed_event = ::ActivePubsub::Event.new(self.class.exchange_key, "destroyed", serialized_resource)
 
       ::ActivePubsub.publish_event(record_destroyed_event)
+
+      ::ActivePubsub.logger.info(record_destroyed_event)
     end
 
     def serialized_resource

data/lib/active_pubsub/publisher.rb

@@ -52,6 +52,8 @@ module ActivePubsub
 
     def publish_event(event)
       ::ActiveRecord::Base.connection_pool.with_connection do
+        ::ActivePubsub.logger.info("Publishing event: #{event.id} to #{event.routing_key}")
+
         exchanges[event.exchange].publish(serialize_event(event), :routing_key => event.routing_key)
       end
     end

data/lib/active_pubsub/railtie.rb

@@ -5,7 +5,7 @@ module ActivePubsub
     # we only need publisher started if service has a publishable model
     ::ActiveSupport.on_load(:active_record) do
       if(::ActivePubsub::Publisher.publishable_model_count > 0) && !::ActivePubsub::Publisher.started?
-        puts "Starting Publisher"
+        ::ActivePubsub.logger.info("Starting Publisher")
         ::ActivePubsub::Publisher.start
       end
     end

data/lib/active_pubsub/subscriber.rb

@@ -18,6 +18,11 @@ module ActivePubsub
       self.local_service_namespace = service_namespace
     end
 
+    def self.clear_connections!
+      channel.close
+      connection.close
+    end
+
     def self.channel
       connection.channel
     end
@@ -46,6 +51,8 @@ module ActivePubsub
 
           subscriber_instance = new(deserialized_record)
           subscriber_instance.instance_exec(deserialized_record, &block)
+
+          ::ActivePubsub.logger.info "#{delivery_info[:routing_key]} #{name} consumed #{deserialized_event}"
         end
       end
 
@@ -53,11 +60,11 @@ module ActivePubsub
     end
 
     def self.deserialize_event(event)
-      @current_event = ::Marshal.load(event)
+      ::Marshal.load(event)
     end
 
     def self.deserialize_record(record)
-      @current_record = ::Marshal.load(record)
+      ::Marshal.load(record)
     end
 
     def self.observes(target_exchange)
@@ -80,7 +87,7 @@ module ActivePubsub
                    "\n"
       end
 
-      puts message
+      ::ActivePubsub.logger.info(message)
     end
 
     def self.started?
@@ -93,6 +100,5 @@ module ActivePubsub
     def initialize(record)
       @record = record
     end
-
   end
 end

data/lib/active_pubsub/version.rb

@@ -1,3 +1,3 @@
 module ActivePubsub
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/active_pubsub.rb

@@ -7,6 +7,8 @@ require "celluloid"
 require "active_support/all"
 require "active_attr"
 require "pry"
+require "active_pubsub/config"
+require "active_pubsub/logging"
 
 module ActivePubsub
   class << self
@@ -16,9 +18,9 @@ module ActivePubsub
     delegate :publish_event, :to => :publisher
   end
 
-  def self.configure
-    self.configuration ||= ::ActivePubsub::Config.new
+  @configuration ||= ::ActivePubsub::Config.new
 
+  def self.configure
     yield(configuration)
 
     ::ActiveSupport.run_load_hooks(:active_pubsub, self)
@@ -28,6 +30,14 @@ module ActivePubsub
     ::Dir.glob(::Rails.root.join('app', 'subscribers', "*.rb")).each{ |file| load file }
   end
 
+  def self.logger
+    configuration.logger
+  end
+
+  def self.logger?
+    configuration.logger.present?
+  end
+
   def self.publisher
     ::Celluloid::Actor[:rabbit_publisher]
   end
@@ -37,11 +47,10 @@ module ActivePubsub
   end
 
   def self.start_subscribers
-
     ::ActivePubsub::Subscriber.subclasses.each do |subscriber|
       next if subscriber.started?
 
-      puts "Starting #{subscriber.name}"
+      ::ActivePubsub.logger.info("Starting #{subscriber.name}")
 
       subscriber.bind_subscriptions!
       subscriber.print_subscriptions!
@@ -51,11 +60,9 @@ module ActivePubsub
   def self.symbolize_routing_key(routing_key)
     :"#{routing_key.split('.').join('_')}"
   end
-
 end
 
 require "active_pubsub/connection"
-require "active_pubsub/config"
 require "active_pubsub/event"
 require "active_pubsub/publisher"
 require "active_pubsub/publishable"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_pubsub
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -314,6 +314,7 @@ files:
 - lib/active_pubsub/config.rb
 - lib/active_pubsub/connection.rb
 - lib/active_pubsub/event.rb
+- lib/active_pubsub/logging.rb
 - lib/active_pubsub/publish_with_serializer.rb
 - lib/active_pubsub/publishable.rb
 - lib/active_pubsub/publisher.rb