manageiq-loggers 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5773ad03d0c3eed3c6751ff24a39f7ca8fc8a48db9f1d26d7b302296af63d73
-  data.tar.gz: 062b8d65c09a5d9b3fa0743b47d647c2b892933e3c22d23937afa2fa7b5c951a
+  metadata.gz: f43cbf53e58f32f3e270f87d248dbf379a0d779be61ec33e72d8ee6f028a265d
+  data.tar.gz: a9dee3b993cef7a02617608887092ace4a7dd4aa0b4e79390225ce5311d485c5
 SHA512:
-  metadata.gz: 66da0f4850139bd628f2919153e036f4a8c8401d8b733a6b761396d8898bd3ec0b919f6762dc57de8a89b9aaa8e945413a622365a0fe72d194399d6886de90ad
-  data.tar.gz: 5b03f2ba30b1ca8aac3a472b02b1cc1bde1be43e3052b21ea81ce1aa4d81877f68ebb4d199af322cd507f359ed7f4bd268af196a3b1ea8e8e73068968201757c
+  metadata.gz: 5140757154082052608cb7e0d60fb902d186ff16c917217ac1a574e2ee9c199d4339e06bc8d0664d54b587c84416496d7a98f8439720e38ab2f1d3697a97fc52
+  data.tar.gz: 8a6a0da62b87fe90889835a42c0c7077b50cb5e6714e45e9e9850b39a6343e2264ae423b802b4681dba3c355e1ada1209e80fe8bc201cc10f148bee3f1f5663e

data/.codeclimate.yml

@@ -28,3 +28,4 @@ plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
+    channel: 'rubocop-0-69'

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.4.1] - 2020-01-06
+### Fixed
+- Change CloudWatch logger log_group and log_stream values for easier debugging and unique identifiers [(#15)](https://github.com/ManageIQ/manageiq-loggers/pull/15)
+- Enhancements to the journald logger to allow for easier debugging [(#11)](https://github.com/ManageIQ/manageiq-loggers/pull/11)
+
 ## [0.4.0] - 2019-08-15
 ### Changed
 - The Cloud Watch logger will now also broadcast its log messages to the container logger [(#10)](https://github.com/ManageIQ/manageiq-loggers/pull/10)
@@ -24,7 +29,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [0.1.0] - 2019-01-08
 
-[Unreleased]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.4.0...master
+[Unreleased]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.4.1...master
+[0.4.1]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.1.1...v0.2.0

data/lib/manageiq/loggers/cloud_watch.rb

@@ -9,8 +9,9 @@ module ManageIQ
       def self.new(*args)
         access_key_id     = ENV["CW_AWS_ACCESS_KEY_ID"].presence
         secret_access_key = ENV["CW_AWS_SECRET_ACCESS_KEY"].presence
-        log_group_name    = ENV["CLOUD_WATCH_LOG_GROUP"].presence
-        log_stream_name   = File.exist?(NAMESPACE_FILE) ? File.read(NAMESPACE_FILE) : nil
+        namespace         = File.exist?(NAMESPACE_FILE) ? File.read(NAMESPACE_FILE) : nil
+        log_group_name    = namespace || ENV["CLOUD_WATCH_LOG_GROUP"].presence
+        log_stream_name   = ENV["HOSTNAME"].presence
 
         container_logger = ManageIQ::Loggers::Container.new
         return container_logger unless access_key_id && secret_access_key && log_group_name && log_stream_name

data/lib/manageiq/loggers/journald.rb

@@ -1,17 +1,33 @@
 module ManageIQ
   module Loggers
     class Journald < Base
+      # An syslog identifier used when writing messages. The default is the progname.
+      attr_accessor :syslog_identifier
+
+      # Create and return a new ManageIQ::Loggers::Journald instance. The
+      # arguments to the initializer can be ignored unless you're multicasting.
+      #
+      # Internally we set our own formatter, and automatically set the
+      # progname option to 'manageiq' if not specified.
+      #
       def initialize(logdev = nil, *args)
         require "systemd-journal"
-
         super(logdev, *args)
-        self.formatter = Formatter.new
+        @formatter = Formatter.new
+        @progname ||= 'manageiq'
+        @syslog_identifier ||= @progname
       end
 
+      # Comply with the VMDB::Logger interface. For a filename we simply use
+      # the string 'journald' since we're not using a backing file directly.
+      #
       def filename
         "journald"
       end
 
+      # Redefine this method from the core Logger class. Internally this is
+      # the method used when .info, .warn, etc are called.
+      #
       def add(severity, message = nil, progname = nil)
         severity ||= Logger::UNKNOWN
         return true if severity < @level
@@ -28,12 +44,22 @@ module ManageIQ
         end
 
         message = formatter.call(format_severity(severity), progname, message)
+        caller_object = caller_locations.last
 
-        Systemd::Journal.print(log_level_map[severity], message)
+        Systemd::Journal.message(
+          :message           => message,
+          :priority          => log_level_map[severity],
+          :syslog_identifier => syslog_identifier,
+          :code_line         => caller_object.lineno,
+          :code_file         => caller_object.absolute_path
+        )
       end
 
       private
 
+      # Map the Systemd::Journal error levels to the Logger error levels. For
+      # unknown, we go with alert level.
+      #
       def log_level_map
         @log_level_map ||= {
           Logger::UNKNOWN => Systemd::Journal::LOG_ALERT,

data/lib/manageiq/loggers/version.rb

@@ -1,5 +1,5 @@
-module Manageiq
+module ManageIQ
   module Loggers
-    VERSION = "0.4.0"
+    VERSION = "0.4.1".freeze
   end
 end

data/manageiq-loggers.gemspec

@@ -2,10 +2,11 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "manageiq/loggers/version"
+require "rbconfig"
 
 Gem::Specification.new do |spec|
   spec.name          = "manageiq-loggers"
-  spec.version       = Manageiq::Loggers::VERSION
+  spec.version       = ManageIQ::Loggers::VERSION
   spec.authors       = ["ManageIQ Authors"]
 
   spec.summary       = %q{Loggers for ManageIQ projects}
@@ -29,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "systemd-journal" if RbConfig::CONFIG['host_os'] =~ /linux/i
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-loggers
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: systemd-journal
+  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'
 description: 
 email: 
 executables: []
@@ -155,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Loggers for ManageIQ projects