redis-stream 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a0fad9e74538a076401cd2dc1e27a58c75369d72eb179d8d03a4454141c3a7
-  data.tar.gz: 399575ac314cbc13e19d25ffb3970576598b7194395192571861b7a0f92a15b3
+  metadata.gz: 83de723fa0769050b81548f00ce3d662b9053b1d89974b314f188756af759e1d
+  data.tar.gz: 83f878051c67908db42aa52928f2f3ba7746d9d7fd40a888dc9412f40db1fc82
 SHA512:
-  metadata.gz: d843bdd4be24eecf5eef0d0f326e3405c2f0e2829d4c545f8e4b13f7d2acf30fc3f8436a4bb010713e6c9e85217b4ddfdf5769cb98bbb05308e33102d09b8140
-  data.tar.gz: 53cca2ee28d14c21e0f3220d72f2d0fa9c241da2e5aac7f2015c69688637163a8132072be6cf20e878adfc7741fb05ee76b2a811f63f2cdf3804be97cf7944e8
+  metadata.gz: dd2618538cb98cd88861e76d3024e5bd54d241669e056763d2986989f6b50cfc7fb24a921aba4d08a6b2ecce005031ac53e9f8639411f991cbe7774fbfec34cc
+  data.tar.gz: e781755937ba2901eeafa7273bf7eea5ceb3bfa8a1c6f2011b196b3ae0695b80413342e3fa1b4ebd147eb08fae4f36e6c618685f29c37379f2844419684e2288

data/lib/redis/stream/client.rb

@@ -219,8 +219,8 @@ class Redis
         payload = nil
 
         unless @cache.nil?
-          if options.include?("cache_key")
-            cache_key = @cache.build_key(data)
+          if options.include?("cache_key") && not(options['cache_key'].nil?)
+            cache_key = options["cache_key"] # @cache.build_key(data)
             if @cache.include?(cache_key)
               if data && data.include?('from_cache') && data['from_cache'].eql?(0)
                 @cache.delete(cache_key)
@@ -237,14 +237,16 @@ class Redis
                 }
                 @logger.info("#{@consumer_id} - fetching from cache with key #{cache_key}")
               end
-
+            else
+              #cache_key = @cache.build_key(data)
+              unless cache_key.nil? || cache_key.empty?
+                @logger.info("#{@consumer_id} - caching with key #{cache_key}")
+                @cache[cache_key] = data
+              end
             end
-          else
-            @logger.info("#{@consumer_id} - fetching from cache with key #{cache_key}")
-            @cache[options["cache_key"]] = data
           end
-
         end
+
         if payload.nil?
           payload = {
               type: type,
@@ -303,53 +305,53 @@ class Redis
       # @param [Boolean] async          return the message if synchronous else call handle_incoming
       # @param [Boolean] passthrough    Receive all messages also the ones intended for other consumers
       def read_next_message_from_stream(async = true, passthrough = false)
-          if @state == Redis::Stream::State::RUNNING
-            result = @redis.xread(@stream, @lastid, block: 1000, count: 1) if @group.nil?
-            result = @redis.xreadgroup(@group, @consumer_id, @stream, '>', block: 1000, count: 1) if @group
-
-            unless result.empty?
-              id, data_out = result[@stream][0]
-              ack_count = @redis.xack(@stream, @group, id) if @group
-
-              tracer_data = JSON.parse(data_out["tracer"])
-              unless tracer_data.nil? || tracer_data.empty?
-                #trace_scope.span.log_kv('has_tracer' => true)
-                tracer_span = OpenTracing.extract(OpenTracing::FORMAT_TEXT_MAP, tracer_data)
-                data_out["tracer"] = OpenTracing.start_span(@consumer_id, child_of: tracer_span)
-              end
-
-              begin
-                data_out["payload"] = JSON.parse(data_out["payload"])
-              rescue Exception => e
-                @logger.error("#{@consumer_id} error parsing payload: #{e.message}")
-              end
+        if @state == Redis::Stream::State::RUNNING
+          result = @redis.xread(@stream, @lastid, block: 1000, count: 1) if @group.nil?
+          result = @redis.xreadgroup(@group, @consumer_id, @stream, '>', block: 1000, count: 1) if @group
+
+          unless result.empty?
+            id, data_out = result[@stream][0]
+            ack_count = @redis.xack(@stream, @group, id) if @group
+
+            tracer_data = JSON.parse(data_out["tracer"])
+            unless tracer_data.nil? || tracer_data.empty?
+              #trace_scope.span.log_kv('has_tracer' => true)
+              tracer_span = OpenTracing.extract(OpenTracing::FORMAT_TEXT_MAP, tracer_data)
+              data_out["tracer"] = OpenTracing.start_span(@consumer_id, child_of: tracer_span)
+            end
 
-              if data_out["from"].eql?(@consumer_id)
-                return false
-              end
+            begin
+              data_out["payload"] = JSON.parse(data_out["payload"])
+            rescue Exception => e
+              @logger.error("#{@consumer_id} error parsing payload: #{e.message}")
+            end
 
-              unless (data_out["to"].nil? || data_out["to"].eql?('') || data_out["to"].eql?('*') || data_out["to"].eql?(@consumer_id)) &&
-                  (data_out["to_group"].nil? || data_out["to_group"].eql?('') || data_out["to_group"].eql?('*') || data_out["to_group"].eql?(@group))
-                @logger.info("#{@consumer_id} - ignoring message from '#{data_out["from"]}' to '#{data_out["to"]}-#{data_out["to_group"]}'")
+            if data_out["from"].eql?(@consumer_id)
+              return false
+            end
 
-                return false
-              end
+            unless (data_out["to"].nil? || data_out["to"].eql?('') || data_out["to"].eql?('*') || data_out["to"].eql?(@consumer_id)) &&
+                (data_out["to_group"].nil? || data_out["to_group"].eql?('') || data_out["to_group"].eql?('*') || data_out["to_group"].eql?(@group))
+              @logger.info("#{@consumer_id} - ignoring message from '#{data_out["from"]}' to '#{data_out["to"]}-#{data_out["to_group"]}'")
 
-              @logger.info("#{@consumer_id} - received from '#{data_out["from"]}' of type '#{data_out['type']}' to '#{data_out["to"]}' in group '#{data_out["to_group"]}' with message id '#{id}' - with ack #{ack_count}")
+              return false
+            end
 
-              if data_out["type"].eql?(Redis::Stream::Type::PING)
-                add(data_out["payload"].to_s, "to" => data_out["from"], "group" => "*", "type" => Redis::Stream::Type::PONG)
-                return false
-              end
+            @logger.info("#{@consumer_id} - received from '#{data_out["from"]}' of type '#{data_out['type']}' to '#{data_out["to"]}' in group '#{data_out["to_group"]}' with message id '#{id}' - with ack #{ack_count}")
 
-              if data_out["type"].eql?(Redis::Stream::Type::PONG)
-                return false
-              end
+            if data_out["type"].eql?(Redis::Stream::Type::PING)
+              add(data_out["payload"].to_s, "to" => data_out["from"], "group" => "*", "type" => Redis::Stream::Type::PONG)
+              return false
+            end
 
-              return data_out unless async
-              handle_incoming(data_out)
+            if data_out["type"].eql?(Redis::Stream::Type::PONG)
+              return false
             end
+
+            return data_out unless async
+            handle_incoming(data_out)
           end
+        end
       rescue Exception => e
         return false
       end

data/lib/redis/stream/data_cache.rb

@@ -5,11 +5,13 @@ require 'redis/stream/config'
 class Redis
   module Stream
     class DataCache
-      def initialize
+      def initialize(logger = Logger.new(STDOUT))
+        @logger = logger
         @cache = Moneta.new(:HashFile, dir: Redis::Stream::Config[:data_cache] || "/tmp/cache", serializer: :json)
       end
 
       def []=(key, value)
+        @logger.info("CACHE - #{File.basename(__FILE__)}:#{__LINE__} - caching with key #{key}")
         @cache.store(key, value)
       end
 
@@ -18,6 +20,10 @@ class Redis
       end
 
       def include?(key)
+        key?(key)
+      end
+
+      def key?(key)
         @cache.key?(key)
       end
 
@@ -38,9 +44,55 @@ class Redis
           id = payload_data["id"].downcase
           key = "#{action}_#{id}"
         end
+        raise "Empty cache key" if key.nil? || key&.empty?
         key
       end
 
+      def resolve_by_message(pid, payload, &block)
+        data = nil
+        cache_key = build_key(payload)
+        invalidate_cache(cache_key, payload)
+        data = load_from_cache(cache_key)
+        data = load_from_service(pid, cache_key, &block) if data.nil?
+
+        data
+      end
+
+      private
+      def invalidate_cache(cache_key, payload)
+        if payload&.include?('from_cache') && payload['from_cache'].eql?('0')
+          delete(cache_key)
+          @logger.warn("CACHE - #{File.basename(__FILE__)}:#{__LINE__} - invalidating key #{cache_key}")
+        end
+      end
+
+      def load_from_cache(cache_key)
+        data = nil
+        if key?(cache_key)
+          @logger.info("CACHE - #{File.basename(__FILE__)}:#{__LINE__} - fetching with key #{cache_key}")
+          data = get_from_cache(cache_key)
+        end
+        data
+      end
+
+      def load_from_service(pid, cache_key)
+        data = nil
+        data = yield pid, cache_key if block_given?
+
+        if data.nil? || data&.empty?
+          @logger.warn("CACHE - #{File.basename(__FILE__)}:#{__LINE__} - empty result for key #{cache_key} and id #{pid}")
+        end
+
+        data
+      end
+
+      def get_from_cache(cache_key)
+        include?(cache_key)
+
+        data = self[cache_key]
+        data = get_from_cache(data['parent']) if data.key?('parent')
+        data
+      end
     end
   end
 end

data/lib/redis/stream/version.rb

@@ -1,6 +1,6 @@
 #encoding: UTF-8
 class Redis
   module Stream
-    VERSION = "0.4.4"
+    VERSION = "0.4.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-stream
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler