prefab-cloud-ruby 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b73b4ea9cec303d84c4e8cd05458a8373cfcb0b7
-  data.tar.gz: 243c8d3dda441efd9b3f5741c6b52355a2256665
+  metadata.gz: 97b59b6c120b77f619a5ab78cd291dd984cc1332
+  data.tar.gz: 5c80408af949c1fe4a952ae5930c3d40e114af1b
 SHA512:
-  metadata.gz: a2375b7451fcd3623a14dd74cdaf568521baa5e554b15f67d1675570a89783f5212938d6f5e2dc44afa4544709cda070d4b59c72dd7124a3f881f3d8ef34f02e
-  data.tar.gz: b1032ec6c8953b2c0896367bd1276315271ba75c68b3f57134b082d35f8b2b972bf36e76546cf34bad48286eadba4cff4d32b2d774403cc550f6d26841a3ef6a
+  metadata.gz: b508f4349be914f86a3ee649c68e5c36f9331ac5088f59619517460773501c880c42c62249cc2b28698e1ad936a99a6a8e69bf5cede528ee5aa2202140494561
+  data.tar.gz: e0da01fbd83a8d55684daca9fa81327a2606ddc8d1cc5dce55e0d9167d02b8aca74b307de18999d1f5b5593e30c4fa8a4f562ec00b16fb60a2b9ad0f76975591

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/lib/prefab/client.rb

@@ -7,7 +7,7 @@ module Prefab
     attr_reader :account_id, :shared_cache, :stats, :namespace, :creds, :interceptor
 
     def initialize(api_key: ENV['PREFAB_API_KEY'],
-                   logger: nil,
+                   logdev: nil,
                    stats: nil, # receives increment("prefab.limitcheck", {:tags=>["policy_group:page_view", "pass:true"]})
                    shared_cache: nil, # Something that quacks like Rails.cache ideally memcached
                    local: false,
@@ -15,9 +15,7 @@ module Prefab
     )
       raise "No API key. Set PREFAB_API_KEY env var" if api_key.empty?
 
-      @logger = (logger || Logger.new($stdout)).tap do |log|
-        log.progname = "Prefab" if log.respond_to? :progname=
-      end
+      @logdev = (logdev || $stdout)
       @local = local
       @stats = (stats || NoopStats.new)
       @shared_cache = (shared_cache || NoopCache.new)
@@ -48,12 +46,12 @@ module Prefab
       @feature_flag_client ||= Prefab::FeatureFlagClient.new(self)
     end
 
-    def log(base_logger = @logger)
-      @logger_client ||= Prefab::LoggerClient.new(base_logger)
+    def log
+      @logger_client ||= Prefab::LoggerClient.new(@logdev)
     end
 
     def log_internal(level, msg)
-      log.log_for level, msg, "prefab"
+      log.log_internal msg, "prefab", nil, level
     end
 
     def request(service, method, req_options: {}, params: {})
@@ -67,7 +65,7 @@ module Prefab
         return stub_for(service, opts[:timeout]).send(method, *params)
       rescue => exception
 
-        log_internal :warn, exception
+        log_internal Logger::WARN, exception
 
         if Time.now - start_time > opts[:timeout]
           raise exception
@@ -75,7 +73,7 @@ module Prefab
         sleep_seconds = [BASE_SLEEP_SEC * (2 ** (attempts - 1)), MAX_SLEEP_SEC].min
         sleep_seconds = sleep_seconds * (0.5 * (1 + rand()))
         sleep_seconds = [BASE_SLEEP_SEC, sleep_seconds].max
-        log_internal :info, "Sleep #{sleep_seconds} and Reset #{service} #{method}"
+        log_internal Logger::INFO, "Sleep #{sleep_seconds} and Reset #{service} #{method}"
         sleep sleep_seconds
         reset!
         retry

data/lib/prefab/config_client.rb

@@ -75,11 +75,11 @@ module Prefab
         deltas.deltas.each do |delta|
           @config_loader.set(delta)
         end
-        @base_client.log_internal :info, "Found checkpoint with highwater id #{@config_loader.highwater_mark}"
+        @base_client.log_internal Logger::INFO, "Found checkpoint with highwater id #{@config_loader.highwater_mark}"
         @config_resolver.update
         finish_init!
       else
-        @base_client.log_internal :info, "No checkpoint"
+        @base_client.log_internal Logger::INFO, "No checkpoint"
       end
     end
 
@@ -88,11 +88,11 @@ module Prefab
     def save_checkpoint
       begin
         deltas = @config_resolver.export_api_deltas
-        @base_client.log_internal :debug, "Save Checkpoint #{@config_loader.highwater_mark} Thread #{Thread.current.object_id}"
+        @base_client.log_internal Logger::DEBUG, "Save Checkpoint #{@config_loader.highwater_mark} Thread #{Thread.current.object_id}"
         @base_client.shared_cache.write(checkpoint_cache_key, Prefab::ConfigDeltas.encode(deltas))
         @base_client.shared_cache.write(checkpoint_highwater_cache_key, @config_loader.highwater_mark)
       rescue StandardError => exn
-        @base_client.log_internal :info, "Issue Saving Checkpoint #{exn.message}"
+        @base_client.log_internal Logger::INFO, "Issue Saving Checkpoint #{exn.message}"
       end
     end
 
@@ -109,7 +109,7 @@ module Prefab
               sleep(delta)
             end
           rescue StandardError => exn
-            @base_client.log_internal :info, "Issue Checkpointing #{exn.message}"
+            @base_client.log_internal Logger::INFO, "Issue Checkpointing #{exn.message}"
           end
         end
       end
@@ -122,20 +122,20 @@ module Prefab
     #    one process "double check" by restarting the API thread
     def checkpoint_if_needed
       shared_highwater_mark = get_shared_highwater_mark
-      @base_client.log_internal :debug, "Checkpoint_if_needed apx ahead/behind #{(@config_loader.highwater_mark - shared_highwater_mark) / (1000 * 10000)}"
+      @base_client.log_internal Logger::DEBUG, "Checkpoint_if_needed apx ahead/behind #{(@config_loader.highwater_mark - shared_highwater_mark) / (1000 * 10000)}"
 
       if shared_highwater_mark > @config_loader.highwater_mark
-        @base_client.log_internal :debug, "We were behind, loading checkpoint"
+        @base_client.log_internal Logger::DEBUG, "We were behind, loading checkpoint"
         load_checkpoint
       elsif shared_highwater_mark < @config_loader.highwater_mark
-        @base_client.log_internal :debug, "Saving off checkpoint"
+        @base_client.log_internal Logger::DEBUG, "Saving off checkpoint"
         save_checkpoint
       elsif shared_highwater_is_old?
         if get_shared_lock?
-          @base_client.log_internal :debug, "Shared highwater mark > PREFAB_CHECKPOINT_MAX_AGE #{@checkpoint_max_age_secs}. We have been chosen to run suspenders"
+          @base_client.log_internal Logger::DEBUG, "Shared highwater mark > PREFAB_CHECKPOINT_MAX_AGE #{@checkpoint_max_age_secs}. We have been chosen to run suspenders"
           reset_api_connection
         else
-          @base_client.log_internal :debug, "Shared highwater mark > PREFAB_CHECKPOINT_MAX_AGE #{@checkpoint_max_age_secs}. Other process is running suspenders"
+          @base_client.log_internal Logger::DEBUG, "Shared highwater mark > PREFAB_CHECKPOINT_MAX_AGE #{@checkpoint_max_age_secs}. Other process is running suspenders"
         end
       end
     end
@@ -146,7 +146,7 @@ module Prefab
 
     def shared_highwater_is_old?
       age = current_time_as_id - get_shared_highwater_mark
-      @base_client.log_internal :debug, "shared_highwater_is_old? apx #{age / (1000 * 10000)}" if age > @checkpoint_max_age
+      @base_client.log_internal Logger::DEBUG, "shared_highwater_is_old? apx #{age / (1000 * 10000)}" if age > @checkpoint_max_age
       age > @checkpoint_max_age_secs
     end
 
@@ -181,7 +181,7 @@ module Prefab
     def start_api_connection_thread(start_at_id)
       config_req = Prefab::ConfigServicePointer.new(account_id: @base_client.account_id,
                                                     start_at_id: start_at_id)
-      @base_client.log_internal :debug, "start api connection thread #{start_at_id}"
+      @base_client.log_internal Logger::DEBUG, "start api connection thread #{start_at_id}"
       @api_connection_thread = Thread.new do
         while true do
           begin
@@ -194,7 +194,7 @@ module Prefab
               finish_init!
             end
           rescue => e
-            @base_client.log_internal :info, ("config client encountered #{e.message} pausing #{RECONNECT_WAIT}")
+            @base_client.log_internal Logger::INFO, ("config client encountered #{e.message} pausing #{RECONNECT_WAIT}")
             reset
             sleep(RECONNECT_WAIT)
           end

data/lib/prefab/config_loader.rb

@@ -66,10 +66,10 @@ module Prefab
 
     def load(filename)
       if File.exist? filename
-        @base_client.log_internal :info, "Load #{filename}"
+        @base_client.log_internal Logger::INFO, "Load #{filename}"
         YAML.load_file(filename)
       else
-        @base_client.log_internal :info, "No file #{filename}"
+        @base_client.log_internal Logger::INFO, "No file #{filename}"
         {}
       end
     end

data/lib/prefab/logger_client.rb

@@ -1,52 +1,73 @@
 module Prefab
-  class LoggerClient
+  class LoggerClient < Logger
 
     SEP = ".".freeze
     BASE = "log_level".freeze
 
-    def initialize(base_logger)
-      @base_logger = base_logger
+    def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
+                   progname: nil, formatter: nil, datetime_format: nil,
+                   shift_period_suffix: '%Y%m%d')
+      super(logdev, shift_age, shift_size, { level: level,
+                                             progname: progname, formatter: formatter, datetime_format: datetime_format,
+                                             shift_period_suffix: shift_period_suffix })
       @config_client = BootstrappingConfigClient.new
     end
 
-    def debug msg
-      pf_log :debug, msg, caller_locations(1, 1)[0]
-    end
+    def add(severity, message = nil, progname = nil)
 
-    def info msg
-      pf_log :info, msg, caller_locations(1, 1)[0]
-    end
+      loc = caller_locations(2, 1)[0]
+      path = get_path(loc.absolute_path, loc.base_label)
 
-    def warn msg
-      pf_log :warn, msg, caller_locations(1, 1)[0]
+      return log_internal(message, path, progname, severity)
     end
 
-    def error msg
-      pf_log :error, msg, caller_locations(1, 1)[0]
+    def log_internal(message, path, progname, severity)
+      level = level_of(path)
+      progname = "#{path}: #{progname}"
+
+
+      severity ||= UNKNOWN
+      if @logdev.nil? or severity < level
+        return true
+      end
+      if progname.nil?
+        progname = @progname
+      end
+      if message.nil?
+        if block_given?
+          message = yield
+        else
+          message = progname
+          progname = @progname
+        end
+      end
+      @logdev.write(
+        format_message(format_severity(severity), Time.now, progname, message))
+      true
     end
 
-    def log_for level, msg, loc
-      pf_log_internal level, msg, "", loc
+    def debug?
+      true;
     end
 
-    def level= lvl
-      #noop
+    def info?
+      true;
     end
 
-    def formatter
-      @formatter ||= ActiveSupport::Logger::SimpleFormatter.new
+    def warn?
+      true;
     end
 
-    def level
-      :debug
+    def error?
+      true;
     end
 
-    def debug?
-      true
+    def fatal?
+      true;
     end
 
-    def info?
-      true
+    def level
+      DEBUG
     end
 
     def set_config_client(config_client)
@@ -55,18 +76,8 @@ module Prefab
 
     private
 
-    def pf_log(level, msg, loc)
-      pf_log_internal level, msg, loc.absolute_path, loc.base_label
-    end
-
-    def pf_log_internal(level, msg, absolute_path, base_label)
-
-      path = absolute_path + ""
-      path.slice! Dir.pwd
-
-      path = "#{path.gsub("/", SEP).gsub(".rb", "")}#{SEP}#{base_label}"
-      path.slice! SEP
-
+    # Find the closest match to 'log_level.path' in config
+    def level_of(path)
       closest_log_level_match = @config_client.get(BASE) || :warn
       path.split(SEP).inject([BASE]) do |memo, n|
         memo << n
@@ -76,23 +87,22 @@ module Prefab
         end
         memo
       end
+      val(closest_log_level_match)
+    end
 
-      if val(closest_log_level_match) <= val(level)
-        @base_logger.unknown "#{level.to_s.upcase.ljust(5)} #{path} #{msg}"
-      end
+    # sanitize & clean the path of the caller so the key
+    # looks like log_level.app.models.user
+    def get_path(absolute_path, base_label)
+      path = absolute_path + ""
+      path.slice! Dir.pwd
+
+      path = "#{path.gsub("/", SEP).gsub(".rb", "")}#{SEP}#{base_label}"
+      path.slice! SEP
+      path
     end
 
     def val level
-      case level.to_sym
-      when :debug then
-        1
-      when :info then
-        2
-      when :warn then
-        3
-      when :error then
-        4
-      end
+      return Object.const_get("Logger::#{level.upcase}")
     end
   end
 

data/prefab-cloud-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.0.15 ruby lib
+# stub: prefab-cloud-ruby 0.0.16 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2018-03-08"
+  s.date = "2018-03-12"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [
@@ -44,7 +44,8 @@ Gem::Specification.new do |s|
     "test/test_config_loader.rb",
     "test/test_config_resolver.rb",
     "test/test_feature_flag_client.rb",
-    "test/test_helper.rb"
+    "test/test_helper.rb",
+    "test/test_logger.rb"
   ]
   s.homepage = "http://github.com/prefab-cloud/prefab-cloud-ruby".freeze
   s.licenses = ["MIT".freeze]

data/test/test_logger.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class TestCLogger < Minitest::Test
+  def setup
+    Prefab::LoggerClient.send(:public, :get_path)
+    Prefab::LoggerClient.send(:public, :level_of)
+    @logger = Prefab::LoggerClient.new($stdout)
+  end
+
+  def test_get_path
+    assert_equal "lib.test_l.foo_warn",
+                 @logger.get_path("/Users/jeffdwyer/Documents/workspace/RateLimitInc/prefab-cloud-ruby/lib/test_l.rb",
+                                  "foo_warn")
+  end
+
+  def test_level_of
+    assert_equal Logger::INFO,
+                 @logger.level_of("app.models.user"), "PREFAB_LOG_CLIENT_BOOTSTRAP_LOG_LEVEL is info"
+
+    @logger.set_config_client(MockConfigClient.new({}))
+    assert_equal Logger::WARN,
+                 @logger.level_of("app.models.user"), "default is warn"
+
+    @logger.set_config_client(MockConfigClient.new("log_level.app" => "info"))
+    assert_equal Logger::INFO,
+                 @logger.level_of("app.models.user")
+
+    @logger.set_config_client(MockConfigClient.new("log_level.app" => "debug"))
+    assert_equal Logger::DEBUG,
+                 @logger.level_of("app.models.user")
+
+    @logger.set_config_client(MockConfigClient.new("log_level.app" => "debug",
+                                                   "log_level.app.models" => "warn"))
+    assert_equal Logger::WARN,
+                 @logger.level_of("app.models.user")
+  end
+end
+
+class MockConfigClient
+  def initialize(hash)
+    @hash = hash
+  end
+
+  def get(key)
+    @hash[key]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -162,6 +162,7 @@ files:
 - test/test_config_resolver.rb
 - test/test_feature_flag_client.rb
 - test/test_helper.rb
+- test/test_logger.rb
 homepage: http://github.com/prefab-cloud/prefab-cloud-ruby
 licenses:
 - MIT