betterlog 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88d9cdea20addad7d2cb055ccf12042e72b17bb83fbd541054169b3de83294f4
-  data.tar.gz: def90b48552d18eafdadea5eb099b12562341d77e3a9f5b83040bc38deb3d9f2
+  metadata.gz: 57cf408499489e3a2a0f7bf2fc51667688ee816e7797984fe4c27ab3393d486a
+  data.tar.gz: a330c835cf6452a13e3b36727f5d296480a22c8b22e12e887df542ff594db450
 SHA512:
-  metadata.gz: 9906c03fe9cc1eddebcdb27b081e504dd812d7e2cf2eeb9fc80661e52364b799a7146a4aab6d8e9118b202882f201f950e90c0f7d89817b491b577340a1796c8
-  data.tar.gz: e57eb4408a119c556f89de5cdac7823fb4cc220be1b0a31faa79988989703cfd2d63e8d6e8a9e46bfc82761052e8789139dcb51611129af825338cdc8a700fe7
+  metadata.gz: eb3d0ce4c94f68b40c704dbe9cb6de03d25cd422b358039536197ebbc0d5f34b53c6c6f39679fae71a3390d5b619acbe2348d826fdf9534407809c5818db09bf
+  data.tar.gz: 0236ab4073d2293e01f1cdc6dbf0157c5d0cb481c2ba1db5069000592ea7d21cdca58f998b04dd505d34ad5718dbbb1020a56b9a77eaceac6ebfdc0a9ecd9fe2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/betterlog/config.go

@@ -0,0 +1,11 @@
+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,4 +1,4 @@
-package bime
+package betterlog
 
 import (
 	"fmt"

data/betterlog/redis_cert_cache.go

@@ -0,0 +1,83 @@
+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/betterlog.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.2.1 ruby lib
+# stub: betterlog 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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-06-27"
+  s.date = "2019-07-04"
   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]
   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, ".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/healthz.go".freeze, "bin/betterlog".freeze, "bin/betterlog_pusher".freeze, "cmd/betterlog-server/LICENSE".freeze, "cmd/betterlog-server/main.go".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/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_spec.rb".freeze, "spec/betterlog/logger_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  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, "cmd/betterlog-server/LICENSE".freeze, "cmd/betterlog-server/main.go".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/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_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.3".freeze
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
+      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"])
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<redis>.freeze, [">= 2.4"])
       s.add_runtime_dependency(%q<excon>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
+      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"])
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<excon>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
+    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"])

data/cmd/betterlog-server/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -14,93 +13,8 @@ import (
 	"github.com/kelseyhightower/envconfig"
 	"github.com/labstack/echo"
 	"github.com/labstack/echo/middleware"
-	"golang.org/x/crypto/acme/autocert"
 )
 
-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"`
-}
-
-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
-}
-
 func postLogHandler(c echo.Context) error {
 	body := c.Request().Body
 	data, err := ioutil.ReadAll(body)
@@ -113,7 +27,7 @@ func postLogHandler(c echo.Context) error {
 	}
 }
 
-func basicAuthConfig(config Config) middleware.BasicAuthConfig {
+func basicAuthConfig(config betterlog.Config) middleware.BasicAuthConfig {
 	return middleware.BasicAuthConfig{
 		Realm: config.HTTP_REALM,
 		Validator: func(username, password string, c echo.Context) (bool, error) {
@@ -126,7 +40,7 @@ func basicAuthConfig(config Config) middleware.BasicAuthConfig {
 	}
 }
 
-func initializeRedis(config Config) *redis.Client {
+func initializeRedis(config betterlog.Config) *redis.Client {
 	options, err := redis.ParseURL(config.REDIS_URL)
 	if err != nil {
 		log.Panic(err)
@@ -136,12 +50,16 @@ func initializeRedis(config Config) *redis.Client {
 }
 
 func main() {
-	var config Config
+	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)))
@@ -150,7 +68,7 @@ func main() {
 	if config.SSL {
 		log.Println("Starting SSL AutoTLS service.")
 		redis := initializeRedis(config)
-		e.AutoTLSManager.Cache = RedisCertCache{
+		e.AutoTLSManager.Cache = betterlog.RedisCertCache{
 			Redis:  redis,
 			PREFIX: config.REDIS_PREFIX,
 		}

data/lib/betterlog/version.rb

@@ -1,6 +1,6 @@
 module Betterlog
   # Betterlog version
-  VERSION         = '0.2.1'
+  VERSION         = '0.2.2'
   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.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - betterplace Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-04 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.9.1
+        version: 1.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +201,9 @@ files:
 - TODO.md
 - VERSION
 - betterlog.gemspec
+- betterlog/config.go
 - betterlog/healthz.go
+- betterlog/redis_cert_cache.go
 - bin/betterlog
 - bin/betterlog_pusher
 - cmd/betterlog-server/LICENSE