salesforce_streamer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2a264193dc13244ad48222544789f305e483baf9a632ffeb6917f72056b5a7
-  data.tar.gz: 0bd3ebadf44a12a7adfa56e07cf1fea47dfe390688df85906a4587e188e3b18c
+  metadata.gz: 155a5949eb2fb6112f66bed9c87ee95b2936dcb29a384cba1e82016aaed9ce7c
+  data.tar.gz: 78f9eda54ef8b075b84446bb80d0f675356a62c3866c7b20dccbafb8480f92f2
 SHA512:
-  metadata.gz: 93986c2fdebc68687bf690a87b3cb1dc542685e5a1db839711d0d925ad78a85d9190a44e818788397bc71d98cb038efa63b4e4dd7138045c832f3ddaff8e3245
-  data.tar.gz: c4d9af017d24f23576b03a88fbd6ca637770fda340154cb9d0085f7461994c28a3127a819b26d2b0fa3a2db1fbb5cf97ecfd43d46ba7029d13e81db56220ef8b
+  metadata.gz: 8d86b2c5c246c2ad74ccb6d8201e59c61f211cd8cdf6fdcbe1f16d01ce2ed8641b0256f4058e3a90ea961d95b0cb6bff3fc3bb8e450540c1848c93ff3bd2aa05
+  data.tar.gz: 91c093c56e46853485770e5688767d1eae5b1821984546c9acd8b240b945775981707a0f4411092f455cb3b6f69635bd2e4427e7f100ef05d2d8ffed134233c5

data/lib/salesforce_streamer/launcher.rb

@@ -6,7 +6,6 @@ module SalesforceStreamer
   # starting the server.
   class Launcher
     def initialize
-      @logger = Configuration.instance.logger
       load_server_configuration
       @manager = TopicManager.new push_topics: @push_topics
       @server = Server.new push_topics: @push_topics
@@ -14,7 +13,7 @@ module SalesforceStreamer
 
     # Manages each PushTopic configured and starts the Streaming API listener.
     def run
-      @logger.info 'Launching Streamer Services'
+      Log.info 'Launching Streamer Services'
       @manager.run
       @server.push_topics = @manager.push_topics
       @server.run
@@ -29,16 +28,16 @@ module SalesforceStreamer
 
     def require_application
       if Configuration.instance.require_path
-        @logger.debug 'Loading the require path'
+        Log.debug 'Loading the require path'
         require Configuration.instance.require_path
       end
     end
 
     def initialize_push_topics
-      @logger.debug 'Loading and validating PushTopics configuration'
+      Log.debug 'Loading and validating PushTopics configuration'
       @push_topics = []
       Configuration.instance.push_topic_data.values.each do |topic_data|
-        @logger.debug topic_data.to_s
+        Log.debug topic_data.to_s
         @push_topics << PushTopic.new(data: topic_data)
       end
     end

data/lib/salesforce_streamer/log.rb

@@ -0,0 +1,13 @@
+module SalesforceStreamer
+  class Log
+    class << self
+      extend Forwardable
+
+      def_delegators :instance, :debug, :info, :warn, :error, :critical
+
+      def instance
+        @instance ||= Configuration.instance.logger
+      end
+    end
+  end
+end

data/lib/salesforce_streamer/push_topic.rb

@@ -20,7 +20,7 @@ module SalesforceStreamer
 
     def replay
       @replay ||= (ReplayPersistence.retrieve(name) || @static_replay).tap do |replayId|
-        Configuration.instance.logger.info ['PushTopic name=', name, ' starting at replayId=', replayId].join
+        Log.info "PushTopic name=#{name} starting at replayId=#{replayId}"
       end
     end
 

data/lib/salesforce_streamer/replay_persistence.rb

@@ -6,13 +6,13 @@ module SalesforceStreamer
   class ReplayPersistence
     class << self
       def record(key, value)
-        Configuration.instance.logger.debug ['Recording ', key, '=', value].join
+        Log.debug { "Recording #{key}=value" }
         Configuration.instance.persistence_adapter&.record key, value
       end
 
       def retrieve(key)
         Configuration.instance.persistence_adapter&.retrieve(key).tap do |v|
-          Configuration.instance.logger.debug ['Retrieved for ', key, ' ', v || 'nil'].join
+        Log.debug { "Retrieved for #{key} #{ v || 'nil' }" }
         end
       end
     end

data/lib/salesforce_streamer/server.rb

@@ -5,14 +5,13 @@ module SalesforceStreamer
     attr_writer :push_topics
 
     def initialize(push_topics: [])
-      @logger = Configuration.instance.logger
       @push_topics = push_topics
       @client = Restforce.new
     end
 
     def run
       @client.authenticate!
-      @logger.info 'Starting Server'
+      Log.info 'Starting Server'
       catch_signals
       start_em
     end
@@ -32,6 +31,7 @@ module SalesforceStreamer
       EM.run do
         @push_topics.map do |topic|
           @client.subscribe topic.name, replay: topic.replay.to_i do |msg|
+            Log.info "Message received from topic #{topic.name}"
             MessageReceiver.call topic.name, topic.handler_constant, msg
           end
         end

data/lib/salesforce_streamer/topic_manager.rb

@@ -6,14 +6,13 @@ module SalesforceStreamer
 
     def initialize(push_topics:)
       @push_topics = push_topics
-      @logger = Configuration.instance.logger
       @client = SalesforceClient.new
     end
 
     def run
-      @logger.info 'Running Topic Manager'
+      Log.info 'Running Topic Manager'
       @push_topics.each do |push_topic|
-        @logger.debug push_topic.to_s
+        Log.debug push_topic.to_s
         upsert(push_topic) if diff?(push_topic)
       end
     end
@@ -23,25 +22,25 @@ module SalesforceStreamer
     def diff?(push_topic)
       hashie = @client.find_push_topic_by_name(push_topic.name)
       unless hashie
-        @logger.info "New PushTopic #{push_topic.name}"
+        Log.info "New PushTopic #{push_topic.name}"
         return true
       end
-      @logger.debug "Remote PushTopic found with hash=#{hashie.to_h}"
+      Log.debug "Remote PushTopic found with hash=#{hashie.to_h}"
       push_topic.id = hashie.Id
       return true unless push_topic.query.eql?(hashie.Query)
       return true unless push_topic.notify_for_fields.eql?(hashie.NotifyForFields)
       return true unless push_topic.api_version.to_s.eql?(hashie.ApiVersion.to_s)
 
-      @logger.debug 'No differences detected'
+      Log.debug 'No differences detected'
       false
     end
 
     def upsert(push_topic)
-      @logger.info "Upsert PushTopic #{push_topic.name}"
+      Log.info "Upsert PushTopic #{push_topic.name}"
       if Configuration.instance.manage_topics?
         @client.upsert_push_topic(push_topic)
       else
-        @logger.info 'Skipping upsert because manage topics is off'
+        Log.info 'Skipping upsert because manage topics is off'
       end
     end
   end

data/lib/salesforce_streamer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SalesforceStreamer
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/salesforce_streamer.rb

@@ -5,9 +5,11 @@ require 'logger'
 require 'optparse'
 require 'restforce'
 require 'yaml'
+require 'forwardable'
 
 require 'salesforce_streamer/configuration'
 require 'salesforce_streamer/errors'
+require 'salesforce_streamer/log'
 require 'salesforce_streamer/push_topic'
 require 'salesforce_streamer/topic_manager'
 require 'salesforce_streamer/salesforce_client'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_streamer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Scott Serok
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,7 @@ files:
 - lib/salesforce_streamer/configuration.rb
 - lib/salesforce_streamer/errors.rb
 - lib/salesforce_streamer/launcher.rb
+- lib/salesforce_streamer/log.rb
 - lib/salesforce_streamer/message_receiver.rb
 - lib/salesforce_streamer/push_topic.rb
 - lib/salesforce_streamer/redis_replay.rb