betterlog 0.20.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b03ee4885ecd0c19dadca8b79729aceae4910400fc8565385957b397838f743
-  data.tar.gz: fd30dde7ce4900e0827078903413425bb065073827a810cc4b7d7da6ec02ef53
+  metadata.gz: dfdf595cf7daec3b80c23beccd01ef848e25e2c02d90d5b0c3b8599b380501e3
+  data.tar.gz: 6854574b6f78fed6ed4654ffb406190b22ecf11f8b1c0ec99cc82622b678a42f
 SHA512:
-  metadata.gz: 5998de5d4c82cd9d2c4072d4a858704d4573ab52bda6f6226550218be2c7e8019f2370fc6792c47cfaf53009c8c4985acadf3ba95efb62c72edec9ce8278313b
-  data.tar.gz: e6ddd8da17426c788b5fecd30164fb8fe051c58bbcd14fedc306e667c34d3ea25d73cdf32e6277d8d89f689936b1694d1435cb41011473f8cd5118e8a80f1946
+  metadata.gz: 876462422afe5f4c32b79c6bc5fa9a9310d43d8c8bcd4edca84b494950f0d59cc5eae5e1f352624875ccd2fb1497a7795f7bbcd40ba23681ba1e94ffe6d7cc27
+  data.tar.gz: 9b5514cffc95723a7331bd9a3183f05e3271fbcaf85e1a813562bb3b4469ac87e8aff57e040264637bbe16bf53d5612a4b70477fb79cae9124613966e72bb2dd

data/.semaphore/semaphore.yml

@@ -43,21 +43,3 @@ blocks:
         - name: RSpec Unit Tests
           commands:
             - bundle exec rake
-
-  - name: Building Docker Image
-    task:
-
-      secrets:
-        - name: GCP
-
-      prologue:
-        commands:
-          - gcloud auth activate-service-account --key-file=.secrets/gcp.json
-          - gcloud auth configure-docker -q eu.gcr.io
-          - checkout
-
-      jobs:
-        - name: Building and pushing
-          commands:
-            - make build
-            - test "$SEMAPHORE_GIT_BRANCH" = "master" && make push-latest || true

data/.tool-versions

@@ -1,3 +1,2 @@
 ruby 3.1.2
 bundler 2.3.17
-golang 1.19

data/Rakefile

@@ -16,21 +16,19 @@ GemHadar do
     'gospace'
   readme      'README.md'
   title       "#{name.camelize}"
-  executables %w[ betterlog betterlog_pusher betterlog_sink ]
+  executables %w[ betterlog ]
 
   dependency 'tins',           '~>1.3', '>=1.22.0'
   dependency 'complex_config'
   dependency 'file-tail',      '~>1.0'
   dependency 'json',           '~>2.0'
   dependency 'term-ansicolor', '~>1.3'
-  dependency 'redis',          '>=2.8'
   dependency 'redlock'
   dependency 'excon'
 
   development_dependency 'rake'
   development_dependency 'rspec'
   development_dependency 'simplecov'
-  development_dependency 'mock_redis'
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.20.3
+1.1.0

data/betterlog.gemspec

@@ -1,24 +1,24 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.20.3 ruby lib
+# stub: betterlog 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.20.3"
+  s.version = "1.1.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 = "2022-08-18"
+  s.date = "2023-02-10"
   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]
-  s.extra_rdoc_files = ["README.md".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]
-  s.files = [".github/workflows/codeql-analysis.yml".freeze, ".gitignore".freeze, ".semaphore/semaphore.yml".freeze, ".tool-versions".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_event_formatter_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/logger_spec.rb".freeze, "spec/betterlog/version_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.executables = ["betterlog".freeze]
+  s.extra_rdoc_files = ["README.md".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/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.rb".freeze]
+  s.files = [".github/workflows/codeql-analysis.yml".freeze, ".gitignore".freeze, ".semaphore/semaphore.yml".freeze, ".tool-versions".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "betterlog.gemspec".freeze, "bin/betterlog".freeze, "config/log.yml".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/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_event_formatter_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/version_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.3.19".freeze
+  s.rubygems_version = "3.3.25".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_event_formatter_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/logger_spec.rb".freeze, "spec/betterlog/version_spec.rb".freeze, "spec/spec_helper.rb".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_event_formatter_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/version_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
@@ -29,13 +29,11 @@ Gem::Specification.new do |s|
     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_development_dependency(%q<mock_redis>.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
@@ -43,13 +41,11 @@ Gem::Specification.new do |s|
     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<mock_redis>.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.8"])
     s.add_dependency(%q<redlock>.freeze, [">= 0"])
     s.add_dependency(%q<excon>.freeze, [">= 0"])
   end

data/lib/betterlog/global_metadata.rb

@@ -10,6 +10,7 @@ module Betterlog
     thread_local(:data) { {} }
 
     def add(data_hash)
+      data_hash = data_hash.symbolize_keys_recursive
       data = data_hash | data
       Notifiers.context(data_hash)
       self

data/lib/betterlog/log_event_formatter.rb

@@ -20,12 +20,15 @@ module Betterlog
           m = m.sub(/\s+$/, '')
 
           timestamp = timestamp.utc.iso8601(3)
-          event = Log::Event.new(
+          event = Log::Event.new({
             emitter:    emitter,
             timestamp:  timestamp,
             message:    m,
             severity:   severity.to_s.downcase,
             # tags:       current_tags,
+            meta: (
+              Sidekiq::Context.current&.symbolize_keys_recursive if defined?(Sidekiq::Context.current)
+            )}.compact
           )
           backtrace = m.scan(/^\s*(?:[^:]+):(?:\d+).*$/)
           if backtrace.size > 1

data/lib/betterlog/version.rb

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

data/lib/betterlog.rb

@@ -10,7 +10,6 @@ require 'betterlog/version'
 require 'betterlog/log'
 require 'betterlog/notifiers'
 require 'betterlog/global_metadata'
-require 'betterlog/logger'
 
 if defined? Rails
   require 'betterlog/railtie'

data/spec/spec_helper.rb

@@ -9,11 +9,5 @@ begin
   require 'byebug'
 rescue LoadError
 end
-require 'mock_redis'
-class MockRedis
-  class BaseConnectionError < StandardError; end
-  class CannotConnectError < BaseConnectionError; end
-end
-Redis=MockRedis
 require 'betterlog'
 Betterlog::Log.default_logger = Logger.new(nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 1.1.0
 platform: ruby
 authors:
 - betterplace Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mock_redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -156,20 +142,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: redlock
   requirement: !ruby/object:Gem::Requirement
@@ -202,8 +174,6 @@ description: This library provides structure json logging for our rails projects
 email: developers@betterplace.org
 executables:
 - betterlog
-- betterlog_pusher
-- betterlog_sink
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -214,7 +184,6 @@ extra_rdoc_files:
 - lib/betterlog/log/event_formatter.rb
 - lib/betterlog/log/severity.rb
 - lib/betterlog/log_event_formatter.rb
-- lib/betterlog/logger.rb
 - lib/betterlog/notifiers.rb
 - lib/betterlog/railtie.rb
 - lib/betterlog/version.rb
@@ -223,26 +192,14 @@ files:
 - ".gitignore"
 - ".semaphore/semaphore.yml"
 - ".tool-versions"
-- Dockerfile
 - Gemfile
 - LICENSE
-- Makefile
 - README.md
 - Rakefile
-- TODO.md
 - VERSION
 - betterlog.gemspec
-- betterlog/config.go
-- betterlog/healthz.go
-- betterlog/redis_cert_cache.go
 - bin/betterlog
-- bin/betterlog_pusher
-- bin/betterlog_sink
-- cmd/betterlog-server/LICENSE
-- cmd/betterlog-server/main.go
 - config/log.yml
-- go.mod
-- go.sum
 - lib/betterlog.rb
 - lib/betterlog/global_metadata.rb
 - lib/betterlog/log.rb
@@ -250,7 +207,6 @@ files:
 - lib/betterlog/log/event_formatter.rb
 - lib/betterlog/log/severity.rb
 - lib/betterlog/log_event_formatter.rb
-- lib/betterlog/logger.rb
 - lib/betterlog/notifiers.rb
 - lib/betterlog/railtie.rb
 - lib/betterlog/version.rb
@@ -259,7 +215,6 @@ files:
 - spec/betterlog/log/severity_spec.rb
 - spec/betterlog/log_event_formatter_spec.rb
 - spec/betterlog/log_spec.rb
-- spec/betterlog/logger_spec.rb
 - spec/betterlog/version_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/betterplace/betterlog
@@ -284,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Structured logging support for bp
@@ -294,6 +249,5 @@ test_files:
 - spec/betterlog/log/severity_spec.rb
 - spec/betterlog/log_event_formatter_spec.rb
 - spec/betterlog/log_spec.rb
-- spec/betterlog/logger_spec.rb
 - spec/betterlog/version_spec.rb
 - spec/spec_helper.rb

data/Dockerfile

@@ -1,49 +0,0 @@
-FROM golang:1.18-alpine AS builder
-
-# Update/Upgrade/Add packages for building
-
-RUN apk add --no-cache bash git build-base
-
-# Create appuser.
-ENV USER=appuser
-ENV UID=10001
-
-RUN adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "/none" \
-    --shell "/sbin/nologin" \
-    --no-create-home \
-    --uid "${UID}" \
-    "${USER}"
-
-
-# Build betterlog
-
-WORKDIR /build/betterlog
-
-ADD . .
-
-ENV GOPATH=/build/betterlog/gospace
-
-RUN make clobber
-
-RUN make setup all
-
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -tags netgo -ldflags='-w -s' -o betterlog-server cmd/betterlog-server/main.go
-
-FROM scratch AS runner
-
-COPY --from=builder /etc/passwd /etc/passwd
-
-COPY --from=builder /etc/group /etc/group
-
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-
-WORKDIR /
-
-COPY --from=builder --chown=appuser:appuser /build/betterlog/betterlog-server /
-
-EXPOSE 5514
-
-ENTRYPOINT [ "/betterlog-server" ]

data/Makefile

@@ -1,65 +0,0 @@
-DOCKER_IMAGE_LATEST = betterlog
-DOCKER_IMAGE = $(DOCKER_IMAGE_LATEST):$(REVISION_SHORT)
-PROJECT_ID = betterplace-183212
-REMOTE_LATEST_TAG := eu.gcr.io/${PROJECT_ID}/$(DOCKER_IMAGE_LATEST)
-REMOTE_TAG = eu.gcr.io/$(PROJECT_ID)/$(DOCKER_IMAGE)
-REVISION := $(shell git rev-parse HEAD)
-REVISION_SHORT := $(shell echo $(REVISION) | head -c 7)
-GOPATH := $(shell pwd)/gospace
-GOBIN = $(GOPATH)/bin
-
-.EXPORT_ALL_VARIABLES:
-
-all: betterlog-server
-
-betterlog-server: cmd/betterlog-server/main.go betterlog/*.go
-	go build -o $@ $<
-
-local: betterlog-server
-	REDIS_URL=$(REDIS_URL) ./betterlog-server
-
-setup: fake-package
-	go mod download
-
-fake-package:
-	rm -rf $(GOPATH)/src/github.com/betterplace/betterlog
-	mkdir -p $(GOPATH)/src/github.com/betterplace
-	ln -s $(shell pwd) $(GOPATH)/src/github.com/betterplace/betterlog
-
-coverage-display: coverage
-	@go tool cover -html=coverage.out
-
-clean:
-	@rm -f betterlog-server coverage.out tags
-
-clobber: clean
-	@rm -rf $(GOPATH)/*
-
-tags: clean
-	@gotags -tag-relative=false -silent=true -R=true -f $@ . $(GOPATH)
-
-build-info:
-	@echo $(DOCKER_IMAGE)
-
-build:
-	docker build --pull -t $(DOCKER_IMAGE) .
-	$(MAKE) build-info
-
-build-force:
-	docker build --pull -t $(DOCKER_IMAGE) --no-cache .
-	$(MAKE) build-info
-
-server:
-	docker run --rm -it $(DOCKER_IMAGE)
-
-pull:
-	docker pull $(REMOTE_TAG)
-	docker tag $(REMOTE_TAG) $(DOCKER_IMAGE)
-
-push: build
-	docker tag $(DOCKER_IMAGE) $(REMOTE_TAG)
-	docker push $(REMOTE_TAG)
-
-push-latest: push
-	docker tag ${DOCKER_IMAGE} ${REMOTE_LATEST_TAG}
-	docker push ${REMOTE_LATEST_TAG}

data/TODO.md

@@ -1 +0,0 @@
- - `complex_config` config files

data/betterlog/config.go

@@ -1,11 +0,0 @@
-package betterlog
-
-type Config struct {
-	PORT         int    `default:"5514"`
-	HEALTHZ_PORT int    `default:"5513"`
-	HTTP_REALM   string `default:"betterlog"`
-	HTTP_AUTH    string
-	SSL          bool
-	REDIS_PREFIX string
-	REDIS_URL    string `default:"redis://localhost:6379"`
-}

data/betterlog/healthz.go

@@ -1,71 +0,0 @@
-package betterlog
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-
-	"github.com/labstack/echo/v4"
-)
-
-type Health struct {
-	PORT int
-}
-
-type Response struct {
-	Hostname string `json:"hostname"`
-	Healthy  bool   `json:"healthy"`
-	Error    string `json:"error,omitempty"`
-	Message  string `json:"message,omitempty"`
-}
-
-func determineHostname() string {
-	hostname, err := os.Hostname()
-	if err != nil {
-		hostname = "unknown"
-	}
-	return hostname
-}
-
-func (health Health) Check() error {
-	return nil
-}
-
-func (health Health) ZPage(next echo.HandlerFunc) echo.HandlerFunc {
-	hostname := determineHostname()
-	return func(c echo.Context) error {
-		if c.Path() == "/healthz" {
-			if err := health.Check(); err == nil {
-				return c.JSON(
-					http.StatusOK,
-					Response{
-						Hostname: hostname,
-						Healthy:  true,
-					},
-				)
-			} else {
-				log.Printf("error: %v", err)
-				return c.JSON(
-					http.StatusInternalServerError,
-					Response{
-						Hostname: hostname,
-						Healthy:  false,
-						Error:    err.Error(),
-						Message:  "problem detected",
-					},
-				)
-			}
-		} else {
-			return next(c)
-		}
-	}
-}
-
-func StartHealthzEcho(health Health) {
-	e := echo.New()
-
-	e.Use(health.ZPage)
-	log.Printf("Starting :%d/healthz", health.PORT)
-	e.Logger.Fatal(e.Start(fmt.Sprintf(":%d", health.PORT)))
-}

data/betterlog/redis_cert_cache.go

@@ -1,83 +0,0 @@
-package betterlog
-
-import (
-	"context"
-	"strings"
-
-	"github.com/go-redis/redis"
-	"golang.org/x/crypto/acme/autocert"
-)
-
-type RedisCertCache struct {
-	Redis  *redis.Client
-	PREFIX string
-}
-
-// Get reads certificate data from the specified key name.
-func (cache RedisCertCache) Get(ctx context.Context, name string) ([]byte, error) {
-	name = strings.Join([]string{cache.PREFIX, name}, "/")
-	done := make(chan struct{})
-	var (
-		err  error
-		data string
-	)
-	go func() {
-		defer close(done)
-		result := cache.Redis.Get(name)
-		err = result.Err()
-		if err == nil {
-			data, err = result.Result()
-		}
-	}()
-	select {
-	case <-ctx.Done():
-		return nil, ctx.Err()
-	case <-done:
-	}
-	if err == redis.Nil {
-		return nil, autocert.ErrCacheMiss
-	}
-	return []byte(data), err
-}
-
-// Put writes the certificate data to the specified redis key name.
-func (cache RedisCertCache) Put(ctx context.Context, name string, data []byte) error {
-	name = strings.Join([]string{cache.PREFIX, name}, "/")
-	done := make(chan struct{})
-	var err error
-	go func() {
-		defer close(done)
-		select {
-		case <-ctx.Done():
-			// Don't overwrite the key if the context was canceled.
-		default:
-			result := cache.Redis.Set(name, string(data), 0)
-			err = result.Err()
-		}
-	}()
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	case <-done:
-	}
-	return err
-}
-
-// Delete removes the specified key name.
-func (cache RedisCertCache) Delete(ctx context.Context, name string) error {
-	name = strings.Join([]string{cache.PREFIX, name}, "/")
-	var (
-		err  error
-		done = make(chan struct{})
-	)
-	go func() {
-		defer close(done)
-		err = cache.Redis.Del(name).Err()
-	}()
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	case <-done:
-	}
-	return err
-}

data/bin/betterlog_pusher

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-# vim: set ft=ruby et sw=2 ts=2:
-
-require 'betterlog'
-require 'excon'
-require 'redlock'
-
-lines     = Integer(ENV.fetch('BETTERLOG_LINES', 1_000))
-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 =
-  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)
-
-quit = false
-[ :TERM, :INT, :QUIT ].each { |s| trap(s) { quit = true } }
-
-STDOUT.sync = true
-loop do
-  count = 0
-  lm.lock!(File.basename($0), lock_time) do
-    print ?…
-    logger.each_slice(lines).with_index do |batch, i|
-      count.zero? and print ?○
-      count += batch.sum(&:size)
-      attempt(attempts: 10, sleep: -60, reraise: true) do
-        print ?┄
-        Excon.post(url, body: batch.join)
-      end
-    end
-  end
-  quit and exit
-  if count.zero?
-    sleep 1
-  else
-    print "→ %s sent.\n" % Tins::Unit.format(count, format: '%.2f %U', prefix: 1024, unit: ?b)
-  end
-rescue Redlock::LockError => e
-  STDERR.puts "Caught #{e.class}: #{e} => Retrying!"
-end

data/bin/betterlog_sink

@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-# vim: set ft=ruby et sw=2 ts=2:
-
-require 'betterlog'
-require 'complex_config/rude'
-require 'json'
-
-LOG_ENV = ENV.fetch('LOG_ENV', 'production')
-
-@config = complex_config.log(LOG_ENV).sink
-
-ENV['KUBECONFIG'] = File.join(
-  ENV.fetch('HOME'),
-  '.kube',
-  @config.cluster.name
-)
-
-def authenticate
-  return if File.exist?(ENV['KUBECONFIG'])
-  context =  [
-    'gke',
-    @config.cluster.project,
-    @config.cluster.zone,
-    @config.cluster.name,
-  ] * ?_
-  system(%{
-    gcloud --no-user-output-enabled container clusters get-credentials \
-    #{@config.cluster.name.inspect} \
-    --zone #{@config.cluster.zone.inspect} \
-    --project #{@config.cluster.project.inspect}
-  }) or fail "failed to authenticate for context #{context.inspect}"
-end
-
-authenticate
-
-pods = JSON(
-  %x{ kubectl -n #{@config.namespace} -ojson get pods },
-  object_class: JSON::GenericObject
-)
-
-if pod = pods.items.find { |i| i.metadata.labels.app == @config.source }
-  system %{
-    kubectl logs -n #{@config.namespace} #{ARGV.join(' ')} #{pod.metadata.name}
-  }
-else
-  exit 1
-end

data/cmd/betterlog-server/LICENSE

@@ -1,13 +0,0 @@
-Copyright 2018 Florian Frank
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

data/cmd/betterlog-server/main.go

@@ -1,83 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-
-	betterlog "github.com/betterplace/betterlog/betterlog"
-	"github.com/go-redis/redis"
-	"github.com/kelseyhightower/envconfig"
-	"github.com/labstack/echo/v4"
-	"github.com/labstack/echo/v4/middleware"
-)
-
-func postLogHandler(c echo.Context) error {
-	body := c.Request().Body
-	data, err := ioutil.ReadAll(body)
-	if err == nil {
-		defer body.Close()
-		os.Stdout.Write(data)
-		return c.NoContent(http.StatusOK)
-	} else {
-		return c.String(http.StatusInternalServerError, err.Error())
-	}
-}
-
-func basicAuthConfig(config betterlog.Config) middleware.BasicAuthConfig {
-	return middleware.BasicAuthConfig{
-		Realm: config.HTTP_REALM,
-		Validator: func(username, password string, c echo.Context) (bool, error) {
-			httpAuth := strings.Split(config.HTTP_AUTH, ":")
-			if username == httpAuth[0] && password == httpAuth[1] {
-				return true, nil
-			}
-			return false, nil
-		},
-	}
-}
-
-func initializeRedis(config betterlog.Config) *redis.Client {
-	options, err := redis.ParseURL(config.REDIS_URL)
-	if err != nil {
-		log.Panic(err)
-	}
-	options.MaxRetries = 3
-	return redis.NewClient(options)
-}
-
-func main() {
-	var config betterlog.Config
-	err := envconfig.Process("", &config)
-	if err != nil {
-		log.Fatal(err)
-	}
-	e := echo.New()
-
-	if !config.SSL {
-		e.Use(betterlog.Health{}.ZPage)
-	}
-	if config.HTTP_AUTH != "" {
-		fmt.Println("info: Configuring HTTP Auth access control")
-		e.Use(middleware.BasicAuthWithConfig(basicAuthConfig(config)))
-	}
-	e.POST("/log", postLogHandler)
-	if config.SSL {
-		log.Println("Starting SSL AutoTLS service.")
-		redis := initializeRedis(config)
-		e.AutoTLSManager.Cache = betterlog.RedisCertCache{
-			Redis:  redis,
-			PREFIX: config.REDIS_PREFIX,
-		}
-		go betterlog.StartHealthzEcho(
-			betterlog.Health{
-				PORT: config.HEALTHZ_PORT,
-			})
-		e.Logger.Fatal(e.StartAutoTLS(fmt.Sprintf(":%d", config.PORT)))
-	} else {
-		e.Logger.Fatal(e.Start(fmt.Sprintf(":%d", config.PORT)))
-	}
-}

data/go.mod

@@ -1,25 +0,0 @@
-module github.com/betterplace/betterlog
-
-go 1.19
-
-require (
-	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/labstack/echo/v4 v4.8.0
-	golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
-)
-
-require (
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/labstack/gommon v0.3.1 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/onsi/gomega v1.19.0 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
-	golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
-)

data/go.sum

@@ -1,127 +0,0 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
-github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
-github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
-github.com/labstack/echo/v4 v4.7.2 h1:Kv2/p8OaQ+M6Ex4eGimg9b9e6icoxA42JSlOR3msKtI=
-github.com/labstack/echo/v4 v4.7.2/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
-github.com/labstack/echo/v4 v4.8.0 h1:wdc6yKVaHxkNOEdz4cRZs1pQkwSXPiRjq69yWP4QQS8=
-github.com/labstack/echo/v4 v4.8.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
-github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o=
-github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
-github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
-github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 h1:NvGWuYG8dkDHFSKksI1P9faiVJ9rayE6l0+ouWVIDs8=
-golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c=
-golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
-golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8=
-golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

data/lib/betterlog/logger.rb

@@ -1,143 +0,0 @@
-begin
-  require 'redis' unless defined?(Redis)
-rescue LoadError
-end
-require 'logger'
-
-module Betterlog
-  class Logger < ::Logger
-    include ComplexConfig::Provider::Shortcuts
-
-    def initialize(redis, shift_age = 0, shift_size = 1048576, name: nil, buffer_size: nil, **opts)
-      @redis       = redis
-      @fallback    = ::Logger.new(STDERR)
-      if level = cc.log.level?
-        self.level      = level
-        @fallback.level = level
-      end
-      @name        = name || self.class.name
-      @buffer_size = determine_buffer_size(buffer_size)
-      super(nil, shift_age, shift_size, **opts)
-    end
-
-    def self.for_redis_url(url, shift_age = 0, shift_size = 1048576,  **opts)
-      redis = Redis.new(url: url)
-      redis.ping
-      new(redis, shift_age, shift_size, **opts)
-    rescue Redis::CannotConnectError
-    end
-
-    private def determine_buffer_size(buffer_size)
-      if buffer_size.nil? || buffer_size < 1 * 1024 ** 2
-        1 * 1024 ** 2 # Default to very small buffer
-      elsif buffer_size > 511 * 1024 ** 2
-        511 * 1024 ** 2 # Stay well below redis' 512Mb upper limit for strings
-      else
-        buffer_size
-      end
-    end
-
-    private def redis_write(msg)
-      # Stop before reaching configured buffer_size limit, after warning a lot.
-      if @redis.strlen(@name) > (@buffer_size * 96) / 100
-        @fallback.error("Redis memory limit will soon be reached =>"\
-          " Log output to redis stops now unless log data is pushed away!")
-        return nil
-      end
-      @redis.append @name, msg
-      self
-    end
-
-
-    def add(severity, message = nil, progname = nil)
-      severity ||= UNKNOWN
-      if 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
-      redis_write(
-        format_message(format_severity(severity), Time.now, progname, message))
-      true
-    rescue Redis::BaseConnectionError
-      @fallback.add(severity, message, progname)
-    end
-
-    def <<(msg)
-      redis_write(msg)
-    rescue Redis::BaseConnectionError
-      @fallback << msg
-    end
-
-    def clear
-      @redis.del @name
-      self
-    end
-
-    def each_chunk(chunk_size: 100 * 1024, &block)
-      chunk_size > 0 or raise ArgumentError, 'chunk_size > 0 required'
-
-      # Delete any remaining temporary keys if we were interrtupted earlier
-      # (or in some other process.)
-      @redis.scan_each(match: "#{@name}_*") do |key|
-        @redis.del key
-      rescue Redis::BaseConnectionError
-      end
-
-      @redis.exists?(@name) or return Enumerator.new {}
-
-      Enumerator.new do |y|
-        name_tmp = "#{@name}_#{rand}"
-        @redis.rename @name, name_tmp
-
-        s = 0
-        e = @redis.strlen(name_tmp) - 1
-        until s > e
-          range = @redis.getrange(name_tmp, s, s + chunk_size - 1)
-          range.force_encoding 'ASCII-8BIT'
-          y.yield range
-          s += chunk_size
-        end
-
-      ensure
-        begin
-          @redis.del name_tmp
-        rescue Redis::BaseConnectionError
-          # We have to delete this later if del command failed here,
-          # see the beginning of this method.
-        end
-      end.each(&block)
-
-    rescue Redis::BaseConnectionError => e
-      # Maybe it works again later, just log the error…
-      @fallback.error(e)
-      Enumerator.new {}
-    end
-
-    def each(chunk_size: 100 * 1024, &block)
-      chunk_size > 0 or raise ArgumentError, 'chunk_size > 0 required'
-      Enumerator.new do |y|
-        buffer = ''
-        buffer.encode! 'ASCII-8BIT'
-        each_chunk(chunk_size: chunk_size) do |chunk|
-          buffer << chunk
-          buffer.gsub!(/\A(.*?#$/)/n) do |line|
-            y.yield(line)
-            ''
-          end
-        end
-        buffer.length > 0 and y.yield(buffer)
-      end.each(&block)
-    end
-    include Enumerable
-  end
-end

data/spec/betterlog/logger_spec.rb

@@ -1,96 +0,0 @@
-require 'spec_helper'
-
-describe Betterlog::Logger do
-  let :logger do
-    described_class.new(Redis.new)
-  end
-
-  describe '.for_redis_url' do
-    it 'can handle not being able to connect to redis' do
-      redis = double
-      allow(redis).to receive(:ping).and_raise Redis::CannotConnectError
-      allow(Redis).to receive(:new).with(url: 'the_url').and_return redis
-      expect(Betterlog::Logger.for_redis_url('the_url')).to be_nil
-    end
-
-    it 'can connect to redis for the url' do
-      redis = double(ping: 'PONG')
-      allow(Redis).to receive(:new).with(url: 'the_url').and_return redis
-      expect(Betterlog::Logger.for_redis_url('the_url')).to be_a Betterlog::Logger
-    end
-  end
-
-  describe '#<<' do
-    it 'writes to redis' do
-      expect(logger.instance_variable_get(:@redis)).to receive(:append).
-        with('Betterlog::Logger', 'foo')
-      logger << 'foo'
-    end
-
-    it 'falls back if redis errors' do
-      allow(logger.instance_variable_get(:@redis)).to receive(:append).
-        and_raise(Redis::BaseConnectionError)
-      expect(logger.instance_variable_get(:@fallback)).to\
-        receive(:<<).with('foo')
-      logger << 'foo'
-    end
-  end
-
-  describe '#add' do
-    it 'writes to redis' do
-      expect(logger.instance_variable_get(:@redis)).to receive(:append).
-        with('Betterlog::Logger', /INFO -- : foo/)
-      logger.info 'foo'
-    end
-
-    it 'falls back if redis errors' do
-      allow(logger.instance_variable_get(:@redis)).to receive(:append).
-        and_raise(Redis::BaseConnectionError)
-      expect(logger.instance_variable_get(:@fallback)).to\
-        receive(:add).with(::Logger::INFO, 'foo', nil)
-      logger.info 'foo'
-    end
-  end
-
-  describe '#each_chunk' do
-    it 'iterates over chunks of data' do
-      logger.clear
-      logger << "foo" * 23
-      expect(logger.each_chunk(chunk_size: 10).to_a).to eq %w[
-        foofoofoof
-        oofoofoofo
-        ofoofoofoo
-        foofoofoof
-        oofoofoofo
-        ofoofoofoo
-        foofoofoo
-      ]
-    end
-
-    it 'works if no data is there' do
-      logger.clear
-      expect(logger.each_chunk(chunk_size: 1).to_a).to eq []
-    end
-
-    it 'iterates if chunk_size is 1 and 23' do
-      logger.clear
-      logger << ?. * 23
-      expect(logger.each_chunk(chunk_size: 1).to_a).to eq [ ?. ] * 23
-    end
-
-    it 'iterates if chunk_size is 1 and 22' do
-      logger.clear
-      logger << ?. * 22
-      expect(logger.each_chunk(chunk_size: 1).to_a).to eq [ ?. ] * 22
-    end
-  end
-
-  describe '#each' do
-    it 'iterates over log lines' do
-      logger.clear
-      logger << "foo\n"
-      logger << "bar\n"
-      expect(logger.to_a).to eq [ "foo\n", "bar\n" ]
-    end
-  end
-end