betterlog 0.20.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c855dbae548c92d83ba4f19705f5227c329ef71e8af4fa274c4fef55d90d3018
-  data.tar.gz: 1a509c3c85d4ffda374fdb87e63609255937b65d60e4380fcde30a4c730fecad
+  metadata.gz: c5171f51dc33171a188c72054895f947fe0fd9ccbe3e3d0e18a9762195cf74b0
+  data.tar.gz: 6111239b6014bf07aadba0431c2f586245f51b7f61f1a6fb5530c0e95bb94705
 SHA512:
-  metadata.gz: d15187a0ec966f4a675bd9fb6ca535a29bb30c2b3d737d1e3fefacf03b7858666e52b8385af1647f0494c8019632217bcf7892ab6b7893dd495f50c248f95174
-  data.tar.gz: 4694ad33f4b6857facbb1fce548d5553ba4906e6cb99fdde0f25f1cbf69ab922912b1c1b63807db628664b0ad09ad54ccbfe08b2091a1accf6935133cceb1cef
+  metadata.gz: f7a065c7e29dbb54423a04128fdc5570d1a2ebf972d0898a4da072b2e215d734c0df3223f9e8b2f704ce8ece011994f17cd6629d20bec494f9808d3ed8350133
+  data.tar.gz: 69833be6a6378e8891f08861f1eaba1207871582cf71b6275f08dd6a87bde9c177c9dbb7757296879c23bf1907b0207547c6ed25b3f4e64c677ac5a7430c4765

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '27 21 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go', 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

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.0.2
-bundler 2.2.26
-golang 1.17
+ruby 3.1.2
+bundler 2.3.17

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.2
+1.0.0

data/betterlog.gemspec

@@ -1,55 +1,51 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.20.2 ruby lib
+# stub: betterlog 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.20.2"
+  s.version = "1.0.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 = "2021-10-28"
+  s.date = "2023-01-30"
   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 = [".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, "cloudbuild.yaml".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/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.2.22".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/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
   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<gem_hadar>.freeze, ["~> 1.12.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_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
-    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.12.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<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/bin/betterlog

@@ -46,6 +46,12 @@ module Betterlog
 
             $ betterlog -f -F rails -p long -c -S ">=error"
 
+          - Match any event containing SELECT
+
+            $ betterlog -f -s SELECT
+
+            $ betterlog -f -s meta:module=api_v4
+
           - Follow rails AND redis logs with default format in colors
             including the last 10 lines:
 

data/lib/betterlog/version.rb

@@ -1,6 +1,6 @@
 module Betterlog
   # Betterlog version
-  VERSION         = '0.20.2'
+  VERSION         = '1.0.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

@@ -6,10 +6,10 @@ require 'term/ansicolor'
 module Betterlog
 end
 
+require 'betterlog/version'
 require 'betterlog/log'
 require 'betterlog/notifiers'
 require 'betterlog/global_metadata'
-require 'betterlog/logger'
 
 if defined? Rails
   require 'betterlog/railtie'

data/spec/betterlog/global_metadata_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
 describe Betterlog::GlobalMetadata do
-  let :notifier do
-    Class.new do
-      def notify(message, hash) end
+  class FakeNotifierClass
+    def notify(message, hash) end
+
+    def context(data_hash) end
+  end
 
-      def context(data_hash) end
-    end.new
+  let :notifier do
+    FakeNotifierClass.new
   end
 
   around do |example|
@@ -27,12 +29,12 @@ describe Betterlog::GlobalMetadata do
   end
 
   it 'can "add" data' do
-    expect(notifier).to receive(:context).with(foo: 'bar')
+    expect_any_instance_of(FakeNotifierClass).to receive(:context).with(foo: 'bar')
     expect(described_class.add(foo: 'bar')).to eq described_class.instance
   end
 
   it 'can "add" data via Log.context' do
-    expect(notifier).to receive(:context).with(foo: 'bar')
+    expect_any_instance_of(FakeNotifierClass).to receive(:context).with(foo: 'bar')
     Betterlog::Log.context(foo: 'bar')
   end
 end

data/spec/betterlog/version_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe 'Betterlog::VERSION' do
+  it 'has one' do
+    expect(Betterlog::VERSION).to be_a String
+  end
+end

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.2
+  version: 1.0.0
 platform: ruby
 authors:
 - betterplace Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2023-01-30 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.11.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -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,35 +184,22 @@ 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
 files:
+- ".github/workflows/codeql-analysis.yml"
 - ".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
-- cloudbuild.yaml
-- 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,7 @@ 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
 licenses: []
@@ -283,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Structured logging support for bp
@@ -293,5 +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,44 +0,0 @@
-FROM alpine:3.14.2 AS builder
-
-# Update/Upgrade/Add packages for building
-
-RUN apk add --no-cache bash git go build-base
-
-# Build happening
-
-WORKDIR /build/betterlog
-
-ADD . .
-
-ENV GOPATH=/build/betterlog/gospace
-
-RUN make clobber
-
-RUN go get -u github.com/betterplace/go-init
-
-RUN make setup all
-
-FROM alpine:3.14.2 AS runner
-
-# Update/Upgrade/Add packages
-
-RUN apk add --no-cache bash ca-certificates
-
-RUN apk add --no-cache tzdata && \
-  cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime && \
-  echo Europe/Berlin >/etc/timezone && \
-  apk del tzdata
-
-ARG APP_DIR=/app
-
-RUN adduser -h ${APP_DIR} -s /bin/bash -D appuser
-
-RUN mkdir -p /opt/bin
-
-COPY --from=builder --chown=appuser:appuser /build/betterlog/gospace/bin/go-init /build/betterlog/betterlog-server /opt/bin/
-
-ENV PATH /opt/bin:${PATH}
-
-EXPOSE 5514
-
-CMD [ "/opt/bin/go-init", "-pre", "/bin/sleep 3", "-main", "/opt/bin/betterlog-server" ]

data/Makefile

@@ -1,71 +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
-
-test:
-	@go test
-
-coverage:
-	@go test -coverprofile=coverage.out
-
-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
-
-debug:
-	docker run --rm -it $(DOCKER_IMAGE) bash
-
-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)))
-}