betterlog 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 669ea0d62356d1741924aa51d8648fc8968cc32a910a9bcd96f88c90d91e494c
-  data.tar.gz: db1a0fb6aea128b0bff226bb912c0d66f0ba40b8955a854a1c6f02fb22e798f9
+  metadata.gz: 35b30ba42034bf3d4a09a4558f8a21b8e48b2a5145b2e56299b4f73f9e14ebd4
+  data.tar.gz: 03df9bb690c3fedb95696fa1c0708a08da9ed5f41246233115fa6444b761a1f5
 SHA512:
-  metadata.gz: a32f1c9ed9581edba4047bc14691a3a94653a553897b478361d012871ae2aa57843786642e41313c836f5fc5bf284153f5bc6bb49e734daf603d19d8cb70d37c
-  data.tar.gz: 56e67e0133c821f0f945328c0d3ddcacbf42503d4b0d21b2e4d454b52291bf95737c38493840828d8ceb308a6c6b1d8ca53c0b8abd17eccf3684511104692520
+  metadata.gz: 4982f6fb3cd975ef1069a8b36617e5494f346084069d3d6eed723152e854bde651d76859cb4e33681889c22821b8be19626dcc1fa396a4bdd166373e5def483e
+  data.tar.gz: 109c8fd2ff8c4f9217188450793aeacf32a580f47c82eafec33e6abea77fa152028207f82a05fbab91142fd73eaf8a34a2493bd1d85e2e3e770434fce12acf27

data/Rakefile

@@ -23,7 +23,7 @@ GemHadar do
   dependency 'file-tail',      '~>1.0'
   dependency 'json',           '~>2.0'
   dependency 'term-ansicolor', '~>1.3'
-  dependency 'redis',          '>=2.4'
+  dependency 'redis',          '>=2.8'
   dependency 'redlock'
   dependency 'excon'
 

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.0

data/betterlog.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.8.1 ruby lib
+# stub: betterlog 0.9.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.8.1"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["betterplace Developers".freeze]
-  s.date = "2019-11-15"
+  s.date = "2020-01-17"
   s.description = "This library provides structure json logging for our rails projects".freeze
   s.email = "developers@betterplace.org".freeze
   s.executables = ["betterlog".freeze, "betterlog_pusher".freeze, "betterlog_sink".freeze]
@@ -16,42 +16,29 @@ Gem::Specification.new do |s|
   s.files = [".gitignore".freeze, ".travis.yml".freeze, "Dockerfile".freeze, "Gemfile".freeze, "LICENSE".freeze, "Makefile".freeze, "README.md".freeze, "Rakefile".freeze, "TODO.md".freeze, "VERSION".freeze, "betterlog.gemspec".freeze, "betterlog/config.go".freeze, "betterlog/healthz.go".freeze, "betterlog/redis_cert_cache.go".freeze, "bin/betterlog".freeze, "bin/betterlog_pusher".freeze, "bin/betterlog_sink".freeze, "cmd/betterlog-server/LICENSE".freeze, "cmd/betterlog-server/main.go".freeze, "config/log.yml".freeze, "go.mod".freeze, "go.sum".freeze, "lib/betterlog.rb".freeze, "lib/betterlog/global_metadata.rb".freeze, "lib/betterlog/log.rb".freeze, "lib/betterlog/log/event.rb".freeze, "lib/betterlog/log/event_formatter.rb".freeze, "lib/betterlog/log/severity.rb".freeze, "lib/betterlog/log_event_formatter.rb".freeze, "lib/betterlog/logger.rb".freeze, "lib/betterlog/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.rb".freeze, "spec/betterlog/global_metadata_spec.rb".freeze, "spec/betterlog/log/event_spec.rb".freeze, "spec/betterlog/log/severity_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/logger_spec.rb".freeze, "spec/spec_helper.rb".freeze]
   s.homepage = "http://github.com/betterplace/betterlog".freeze
   s.rdoc_options = ["--title".freeze, "Betterlog".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.0.6".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "Structured logging support for bp".freeze
   s.test_files = ["spec/betterlog/global_metadata_spec.rb".freeze, "spec/betterlog/log/event_spec.rb".freeze, "spec/betterlog/log/severity_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/logger_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.10.0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.3", ">= 1.22.0"])
-      s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<file-tail>.freeze, ["~> 1.0"])
-      s.add_runtime_dependency(%q<json>.freeze, ["~> 2.0"])
-      s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
-      s.add_runtime_dependency(%q<redis>.freeze, [">= 2.4"])
-      s.add_runtime_dependency(%q<redlock>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<excon>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.10.0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<tins>.freeze, ["~> 1.3", ">= 1.22.0"])
-      s.add_dependency(%q<complex_config>.freeze, [">= 0"])
-      s.add_dependency(%q<file-tail>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<json>.freeze, ["~> 2.0"])
-      s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
-      s.add_dependency(%q<redis>.freeze, [">= 2.4"])
-      s.add_dependency(%q<redlock>.freeze, [">= 0"])
-      s.add_dependency(%q<excon>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.3", ">= 1.22.0"])
+    s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<file-tail>.freeze, ["~> 1.0"])
+    s.add_runtime_dependency(%q<json>.freeze, ["~> 2.0"])
+    s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
+    s.add_runtime_dependency(%q<redis>.freeze, [">= 2.8"])
+    s.add_runtime_dependency(%q<redlock>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<excon>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.10.0"])
+    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
@@ -60,7 +47,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<file-tail>.freeze, ["~> 1.0"])
     s.add_dependency(%q<json>.freeze, ["~> 2.0"])
     s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
-    s.add_dependency(%q<redis>.freeze, [">= 2.4"])
+    s.add_dependency(%q<redis>.freeze, [">= 2.8"])
     s.add_dependency(%q<redlock>.freeze, [">= 0"])
     s.add_dependency(%q<excon>.freeze, [">= 0"])
   end

data/bin/betterlog_pusher

@@ -10,7 +10,16 @@ lock_time = Integer(ENV.fetch('BETTERLOG_LOCK_TIME', 60_000))
 url       = ENV.fetch('BETTERLOG_SERVER_URL')
 name      = ENV['BETTERLOG_NAME']
 redis_url = ENV.fetch('REDIS_URL')
-redis     = Redis.new(url: redis_url)
+redis =
+  if redis_sentinels = ENV['REDIS_SENTINELS']&.split(?,)
+    redis_sentinels.map! { |s|
+      h, p = s.split(?:, 2)
+      { host: h, port: (p || 26379).to_i }
+    }
+    Redis.new(url: redis_url, sentinels: redis_sentinels, role: :master)
+  else
+    Redis.new(url: redis_url)
+  end
 lm        = Redlock::Client.new([ redis_url ])
 logger    = Betterlog::Logger.new(redis, name: name)
 

data/config/log.yml

@@ -15,7 +15,7 @@ development: &development
       "{%0.<%= ENV.fetch('COLUMNS', 80).to_i / 2 %>%message}"
       {host}
       {location}
-      {file}{-%O%backtrace}{-%O%meta}
+      {file}{-%O%error_class}{-%O%backtrace}{-%O%meta}
     d: *default_format
     long: &long_format |
       timestamp: {%lt%timestamp}

data/lib/betterlog/version.rb

@@ -1,6 +1,6 @@
 module Betterlog
   # Betterlog version
-  VERSION         = '0.8.1'
+  VERSION         = '0.9.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - betterplace Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: redlock
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Structured logging support for bp