manageiq-loggers 0.5.0 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +0 -1
- data/CHANGELOG.md +14 -1
- data/lib/manageiq/loggers/container.rb +8 -6
- data/lib/manageiq/loggers/journald.rb +3 -2
- data/lib/manageiq/loggers/version.rb +1 -1
- data/manageiq-loggers.gemspec +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0b939ba32542c3e8a6c44e535465dacb5a276a86d17891dee3b31fd17afd29f6
|
4
|
+
data.tar.gz: b386c5453ce9d2895b5f90f37c618d387f081fd04ce2f60f8d012229aa51703e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d48fdc4dc59288ea52a96bf9f0d7856e9c87365730f2cd2c752f7ae975176210eb8f96e581e462244a87a21dc5369f5178d6af0ce3ceeca8e86ccad4e63398d0
|
7
|
+
data.tar.gz: de3a7f0df5627f78ba5d9057299ff2f7c17d6be5642e90d704fbf077be1d02fde32394f90e264dd5356b5a3d1e8f99454e8981d70c995fdd39628bc2a84739b7
|
data/.travis.yml
CHANGED
data/CHANGELOG.md
CHANGED
@@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|
5
5
|
|
6
6
|
## [Unreleased]
|
7
7
|
|
8
|
+
## [0.6.0] - 2020-12-09
|
9
|
+
### Changed
|
10
|
+
- Update rake dependency to address CVE-2020-8130 [(#19)](https://github.com/ManageIQ/manageiq-loggers/pull/19)
|
11
|
+
|
12
|
+
### Fixed
|
13
|
+
- Fix escaping of < and > in Container logger (31 minutes ago) <Jason Frey> [(#29)](https://github.com/ManageIQ/manageiq-loggers/pull/29)
|
14
|
+
- Fix ActiveSupport::Deprecation call (35 minutes ago) <Jason Frey> [(#29)](https://github.com/ManageIQ/manageiq-loggers/pull/29)
|
15
|
+
- Fix the handling of journald code_file/code_line [(#21)](https://github.com/ManageIQ/manageiq-loggers/pull/21) [(#22)](https://github.com/ManageIQ/manageiq-loggers/pull/22)
|
16
|
+
|
17
|
+
### Added
|
18
|
+
- Add code_func to the journald logger [(#23)](https://github.com/ManageIQ/manageiq-loggers/pull/23)
|
19
|
+
|
8
20
|
## [0.5.0] - 2020-03-18
|
9
21
|
### Changed
|
10
22
|
- Deprecate Thread.current[:current_request]&.request_id in favor of Thread.current[:request_id] [(#17)](https://github.com/ManageIQ/manageiq-loggers/pull/17)
|
@@ -37,7 +49,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|
37
49
|
|
38
50
|
## [0.1.0] - 2019-01-08
|
39
51
|
|
40
|
-
[Unreleased]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.
|
52
|
+
[Unreleased]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.6.0...master
|
53
|
+
[0.6.0]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.5.0...v0.6.0
|
41
54
|
[0.5.0]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.4.2...v0.5.0
|
42
55
|
[0.4.2]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.4.1...v0.4.2
|
43
56
|
[0.4.1]: https://github.com/ManageIQ/manageiq-loggers/compare/v0.4.0...v0.4.1
|
@@ -36,7 +36,7 @@ module ManageIQ
|
|
36
36
|
def call(severity, time, progname, msg)
|
37
37
|
# From https://github.com/ViaQ/elasticsearch-templates/releases -> Downloads -> *.asciidoc
|
38
38
|
# NOTE: These values are in a specific order for easier human readbility via STDOUT
|
39
|
-
{
|
39
|
+
payload = {
|
40
40
|
:@timestamp => format_datetime(time),
|
41
41
|
:hostname => hostname,
|
42
42
|
:pid => $PROCESS_ID,
|
@@ -46,7 +46,8 @@ module ManageIQ
|
|
46
46
|
:message => prefix_task_id(msg2str(msg)),
|
47
47
|
:request_id => request_id
|
48
48
|
# :tags => "tags string",
|
49
|
-
}.compact
|
49
|
+
}.compact
|
50
|
+
JSON.generate(payload) << "\n"
|
50
51
|
end
|
51
52
|
|
52
53
|
private
|
@@ -64,11 +65,12 @@ module ManageIQ
|
|
64
65
|
end
|
65
66
|
|
66
67
|
def request_id
|
67
|
-
|
68
|
-
|
68
|
+
Thread.current[:request_id] || Thread.current[:current_request]&.request_id.tap do |request_id|
|
69
|
+
if request_id
|
70
|
+
require "active_support/deprecation"
|
71
|
+
ActiveSupport::Deprecation.warn("Usage of `Thread.current[:current_request]&.request_id` will be deprecated in version 0.5.0. Please switch to `Thread.current[:request_id]` to log request_id automatically.")
|
72
|
+
end
|
69
73
|
end
|
70
|
-
|
71
|
-
Thread.current[:current_request]&.request_id || Thread.current[:request_id]
|
72
74
|
end
|
73
75
|
end
|
74
76
|
end
|
@@ -44,14 +44,15 @@ module ManageIQ
|
|
44
44
|
end
|
45
45
|
|
46
46
|
message = formatter.call(format_severity(severity), progname, message)
|
47
|
-
caller_object = caller_locations.
|
47
|
+
caller_object = caller_locations(3, 1).first
|
48
48
|
|
49
49
|
Systemd::Journal.message(
|
50
50
|
:message => message,
|
51
51
|
:priority => log_level_map[severity],
|
52
52
|
:syslog_identifier => syslog_identifier,
|
53
53
|
:code_line => caller_object.lineno,
|
54
|
-
:code_file => caller_object.absolute_path
|
54
|
+
:code_file => caller_object.absolute_path,
|
55
|
+
:code_func => caller_object.label
|
55
56
|
)
|
56
57
|
end
|
57
58
|
|
data/manageiq-loggers.gemspec
CHANGED
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
|
|
27
27
|
|
28
28
|
spec.add_development_dependency "bundler"
|
29
29
|
spec.add_development_dependency "cloudwatchlogger"
|
30
|
-
spec.add_development_dependency "rake", "
|
30
|
+
spec.add_development_dependency "rake", ">= 12.3.3"
|
31
31
|
spec.add_development_dependency "rspec", "~> 3.0"
|
32
32
|
spec.add_development_dependency "simplecov"
|
33
33
|
spec.add_development_dependency "systemd-journal" if RbConfig::CONFIG['host_os'] =~ /linux/i
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: manageiq-loggers
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- ManageIQ Authors
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-12-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -70,16 +70,16 @@ dependencies:
|
|
70
70
|
name: rake
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- - "
|
73
|
+
- - ">="
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version:
|
75
|
+
version: 12.3.3
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- - "
|
80
|
+
- - ">="
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version:
|
82
|
+
version: 12.3.3
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: rspec
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|