logster 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e8e70cfba330bd669fd9a1957e87ff506d4e62b57a1cb033a13a790c89b0d0
-  data.tar.gz: 95b85f82307e45a3097d126dee293161cd3df88efbd612b01c6ba8e7acda8f64
+  metadata.gz: 7c4722bc20fa59b59150406aa51fce3a83cc4c922332dc42d0e6f288fc3ade4c
+  data.tar.gz: fab3d1bece8a5de7eff3da48fe5b131b4d86e70332017e4eb46b7415e052fa20
 SHA512:
-  metadata.gz: 643be65fc5fa5de070f932c0d333b0a01a8300ff2c50118b82ddeda4ddbb034a663a00d3ed2c2898dbcecf536c7d7092d360fd9ba4b8b959c650eb276919e310
-  data.tar.gz: 6fe96f60769edf2c23b61450401e873013b791c6b116104d35e6860acb889f1e26f2e79472b023ba1c6d534528b45a39ded046746bfe12bde381b50e03dccb1b
+  metadata.gz: ee664e54fb5d8ebc459e0b7af99f7e32876de09e4bf0177499956b3243860ff8d8908f75c84c567ff709c39e26204aa7cab67b3627a5ae5eb7f133dfa82a36b2
+  data.tar.gz: bec1f484966140b3dfd98969d065b7b9cb23e3c7f6730148a7c610db9ea72b413327289377b19d41a460e15b20647909fa593abbf859569ba38c5f9e2e75ea3f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+- 2020-02-17: 2.6.3
+
+  - FIX: Respect redis namespace when fetching env using LUA
+
 - 2020-02-09: 2.6.2
 
   - FIX: Regression with rendering single env when `env_expandable_keys` config is present

data/lib/logster/redis_store.rb

@@ -249,11 +249,11 @@ module Logster
         envs = {}
         @redis.eval(
           BULK_ENV_GET_LUA,
-          keys: message_keys.map { |k| env_prefix(k) }
+          keys: message_keys.map { |k| env_prefix(k, with_namespace: true) }
         ).to_h.each do |k, v|
           next if v.size == 0
           parsed = v.size == 1 ? JSON.parse(v[0]) : v.map { |e| JSON.parse(e) }
-          envs[env_unprefix(k)] = parsed
+          envs[env_unprefix(k, with_namespace: true)] = parsed
         end
       end
       messages = @redis.hmget(hash_key, message_keys).map! do |json|
@@ -647,12 +647,28 @@ module Logster
       @redis.del(env_prefix(message_key))
     end
 
-    def env_unprefix(key)
-      key.sub(ENV_PREFIX, "")
+    def env_unprefix(key, with_namespace: false)
+      prefix = ENV_PREFIX
+      if with_namespace && namespace
+        prefix = "#{namespace}:#{prefix}"
+      end
+      key.sub(prefix, "")
+    end
+
+    def env_prefix(key, with_namespace: false)
+      prefix = ENV_PREFIX
+      if with_namespace && namespace
+        prefix = "#{namespace}:#{prefix}"
+      end
+      prefix + key
     end
 
-    def env_prefix(key)
-      ENV_PREFIX + key
+    def namespace
+      if @redis_prefix.respond_to?(:call)
+        @namespace ||= @redis_prefix.call
+      else
+        @namespace ||= @redis_prefix
+      end
     end
   end
 end

data/lib/logster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Logster
-  VERSION = "2.6.2"
+  VERSION = "2.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - UI for viewing logs in Rack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -314,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: UI for viewing logs in Rack