docker-fluent-logger 0.0.7 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.bundle/config +2 -0
- data/.gitignore +3 -11
- data/Gemfile.lock +114 -0
- data/README.md +51 -19
- data/docker-fluent-logger.gemspec +3 -4
- data/example/sample.rb +2 -1
- data/lib/docker-fluent-logger.rb +16 -2
- data/lib/docker-fluent-logger/cli.rb +1 -2
- data/lib/docker-fluent-logger/generator/templates/lograge.rb +3 -1
- data/lib/docker-fluent-logger/payload.rb +9 -0
- data/lib/docker-fluent-logger/version.rb +1 -1
- metadata +16 -31
- data/lib/docker-fluent-logger/generator/.DS_Store +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: aca4a5da725721553fd4f2d7b6415277f82ead7af9ba3cd38b3cfef619092c49
|
4
|
+
data.tar.gz: a30face36136ee7cacbe1deeb82edfb6bac0ef3ba7658ab40a15a18cb0c58e17
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3bcbf8ef21cf21c87d5b88d869a9a588e2784353a92609858ac6651264f8b1e1fffd8d7eddbfa73ad48821441652f5c4195c2589cfcecae60498f42c2016b977
|
7
|
+
data.tar.gz: b292592486926bcdb6a41d96d7ee3fdd12cc4eb5f4352dd8a300708c9c704093c349a0f7bf4aa2102f11093993c394ae8005f477f202f4d9055d4d7129cbc79d
|
data/.bundle/config
ADDED
data/.gitignore
CHANGED
data/Gemfile.lock
ADDED
@@ -0,0 +1,114 @@
|
|
1
|
+
PATH
|
2
|
+
remote: .
|
3
|
+
specs:
|
4
|
+
docker-fluent-logger (1.0.1)
|
5
|
+
activesupport (>= 5.0.0)
|
6
|
+
lograge (~> 0.5)
|
7
|
+
oj (~> 3.10.0)
|
8
|
+
thor (~> 1.0)
|
9
|
+
|
10
|
+
GEM
|
11
|
+
remote: https://rubygems.org/
|
12
|
+
specs:
|
13
|
+
actionpack (6.1.0)
|
14
|
+
actionview (= 6.1.0)
|
15
|
+
activesupport (= 6.1.0)
|
16
|
+
rack (~> 2.0, >= 2.0.9)
|
17
|
+
rack-test (>= 0.6.3)
|
18
|
+
rails-dom-testing (~> 2.0)
|
19
|
+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
20
|
+
actionview (6.1.0)
|
21
|
+
activesupport (= 6.1.0)
|
22
|
+
builder (~> 3.1)
|
23
|
+
erubi (~> 1.4)
|
24
|
+
rails-dom-testing (~> 2.0)
|
25
|
+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
26
|
+
activesupport (6.1.0)
|
27
|
+
concurrent-ruby (~> 1.0, >= 1.0.2)
|
28
|
+
i18n (>= 1.6, < 2)
|
29
|
+
minitest (>= 5.1)
|
30
|
+
tzinfo (~> 2.0)
|
31
|
+
zeitwerk (~> 2.3)
|
32
|
+
ast (2.4.0)
|
33
|
+
builder (3.2.4)
|
34
|
+
concurrent-ruby (1.1.7)
|
35
|
+
crass (1.0.6)
|
36
|
+
diff-lcs (1.3)
|
37
|
+
erubi (1.10.0)
|
38
|
+
i18n (1.8.5)
|
39
|
+
concurrent-ruby (~> 1.0)
|
40
|
+
jaro_winkler (1.5.4)
|
41
|
+
lograge (0.11.2)
|
42
|
+
actionpack (>= 4)
|
43
|
+
activesupport (>= 4)
|
44
|
+
railties (>= 4)
|
45
|
+
request_store (~> 1.0)
|
46
|
+
loofah (2.8.0)
|
47
|
+
crass (~> 1.0.2)
|
48
|
+
nokogiri (>= 1.5.9)
|
49
|
+
method_source (1.0.0)
|
50
|
+
mini_portile2 (2.4.0)
|
51
|
+
minitest (5.14.2)
|
52
|
+
nokogiri (1.10.10)
|
53
|
+
mini_portile2 (~> 2.4.0)
|
54
|
+
oj (3.10.17)
|
55
|
+
parallel (1.19.1)
|
56
|
+
parser (2.6.5.0)
|
57
|
+
ast (~> 2.4.0)
|
58
|
+
rack (2.2.3)
|
59
|
+
rack-test (1.1.0)
|
60
|
+
rack (>= 1.0, < 3)
|
61
|
+
rails-dom-testing (2.0.3)
|
62
|
+
activesupport (>= 4.2.0)
|
63
|
+
nokogiri (>= 1.6)
|
64
|
+
rails-html-sanitizer (1.3.0)
|
65
|
+
loofah (~> 2.3)
|
66
|
+
railties (6.1.0)
|
67
|
+
actionpack (= 6.1.0)
|
68
|
+
activesupport (= 6.1.0)
|
69
|
+
method_source
|
70
|
+
rake (>= 0.8.7)
|
71
|
+
thor (~> 1.0)
|
72
|
+
rainbow (3.0.0)
|
73
|
+
rake (10.5.0)
|
74
|
+
request_store (1.5.0)
|
75
|
+
rack (>= 1.4)
|
76
|
+
rspec (3.9.0)
|
77
|
+
rspec-core (~> 3.9.0)
|
78
|
+
rspec-expectations (~> 3.9.0)
|
79
|
+
rspec-mocks (~> 3.9.0)
|
80
|
+
rspec-core (3.9.0)
|
81
|
+
rspec-support (~> 3.9.0)
|
82
|
+
rspec-expectations (3.9.0)
|
83
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
84
|
+
rspec-support (~> 3.9.0)
|
85
|
+
rspec-mocks (3.9.0)
|
86
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
87
|
+
rspec-support (~> 3.9.0)
|
88
|
+
rspec-support (3.9.0)
|
89
|
+
rubocop (0.77.0)
|
90
|
+
jaro_winkler (~> 1.5.1)
|
91
|
+
parallel (~> 1.10)
|
92
|
+
parser (>= 2.6)
|
93
|
+
rainbow (>= 2.2.2, < 4.0)
|
94
|
+
ruby-progressbar (~> 1.7)
|
95
|
+
unicode-display_width (>= 1.4.0, < 1.7)
|
96
|
+
ruby-progressbar (1.10.1)
|
97
|
+
thor (1.0.1)
|
98
|
+
tzinfo (2.0.3)
|
99
|
+
concurrent-ruby (~> 1.0)
|
100
|
+
unicode-display_width (1.6.0)
|
101
|
+
zeitwerk (2.4.2)
|
102
|
+
|
103
|
+
PLATFORMS
|
104
|
+
ruby
|
105
|
+
|
106
|
+
DEPENDENCIES
|
107
|
+
bundler (~> 1.14)
|
108
|
+
docker-fluent-logger!
|
109
|
+
rake (~> 10.0)
|
110
|
+
rspec (~> 3.0)
|
111
|
+
rubocop (~> 0.48)
|
112
|
+
|
113
|
+
BUNDLED WITH
|
114
|
+
1.17.2
|
data/README.md
CHANGED
@@ -1,6 +1,48 @@
|
|
1
1
|
# DockerFluentLogger
|
2
2
|
|
3
|
-
|
3
|
+
Output Rails log to JSON format.
|
4
|
+
|
5
|
+
## e.g.
|
6
|
+
|
7
|
+
HTTP request outputs following log to STDOUT.
|
8
|
+
|
9
|
+
```
|
10
|
+
{
|
11
|
+
"method": "GET",
|
12
|
+
"path": "/",
|
13
|
+
"format": "html",
|
14
|
+
"controller": "IndexController",
|
15
|
+
"action": "index",
|
16
|
+
"status": 403,
|
17
|
+
"duration": 428.27,
|
18
|
+
"view": 0.29,
|
19
|
+
"db": 0.0,
|
20
|
+
"timestamp": "2019-12-11T12:21:00.050200Z",
|
21
|
+
"hostname": "f78a33527a16",
|
22
|
+
"uuid": "a4ecff04-d6d9-4477-8746-0b78ccae0e13",
|
23
|
+
"url": "http://localhost:3000/",
|
24
|
+
"remote_ip": "172.29.0.1",
|
25
|
+
"referer": null,
|
26
|
+
"user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36"
|
27
|
+
}
|
28
|
+
```
|
29
|
+
|
30
|
+
Rails logger also output logs in JSON as well.
|
31
|
+
|
32
|
+
```
|
33
|
+
logger.info('example')
|
34
|
+
# Or
|
35
|
+
DockerFluentLogger.create.info('example')
|
36
|
+
```
|
37
|
+
|
38
|
+
Following log is output.
|
39
|
+
```
|
40
|
+
{
|
41
|
+
"severity": "INFO",
|
42
|
+
"timestamp": "2019-12-11T12:19:01.599089Z",
|
43
|
+
"message": "example"
|
44
|
+
}
|
45
|
+
```
|
4
46
|
|
5
47
|
## Installation
|
6
48
|
|
@@ -30,34 +72,24 @@ $ bundle exec docker-fluent-logger install
|
|
30
72
|
create config/initializers/lograge.rb
|
31
73
|
```
|
32
74
|
|
33
|
-
Add following code to `app/
|
75
|
+
Add following code to `app/controllers/application_controller.rb`.
|
34
76
|
|
35
77
|
```ruby
|
36
|
-
|
37
|
-
|
38
|
-
rescue_from Exception, with: :render_500 unless Rails.env.production?
|
78
|
+
class ApplicationController < ActionController::Base
|
79
|
+
include DockerFluentLogger::Payload
|
39
80
|
|
40
|
-
|
41
|
-
logger.fatal(e.to_s + ' ' + e.backtrace.to_s)
|
81
|
+
rescue_from Exception, with: :render_500 if Rails.env.production?
|
42
82
|
|
43
|
-
|
83
|
+
def render_500(e = nil)
|
84
|
+
append_payload_error(e) if e.present?
|
85
|
+
end
|
44
86
|
end
|
45
87
|
```
|
46
88
|
|
47
89
|
Add following code to `config/environments/***.rb`.
|
48
90
|
|
49
91
|
```ruby
|
50
|
-
|
51
|
-
config.logger = DockerFluentLogger.create
|
52
|
-
end
|
53
|
-
```
|
54
|
-
|
55
|
-
When using [ECS Deployer](https://github.com/naomichi-y/ecs_deployer), Add `RAILS_LOG_TO_STDOUT` variable to `config/deploy/***.yml`.
|
56
|
-
|
57
|
-
```yaml
|
58
|
-
environment:
|
59
|
-
- name: RAILS_LOG_TO_STDOUT
|
60
|
-
value: enabled
|
92
|
+
config.logger = DockerFluentLogger.create
|
61
93
|
```
|
62
94
|
|
63
95
|
## License
|
@@ -31,11 +31,10 @@ Gem::Specification.new do |spec|
|
|
31
31
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
32
32
|
spec.require_paths = ['lib']
|
33
33
|
|
34
|
-
spec.add_dependency 'thor', '~> 0.19'
|
35
|
-
spec.add_dependency 'lograge', '~> 0.5'
|
36
|
-
spec.add_dependency 'logstash-logger', '~> 0.24'
|
37
|
-
spec.add_dependency 'logstash-event', '~> 1.2'
|
38
34
|
spec.add_dependency 'activesupport', '>= 5.0.0'
|
35
|
+
spec.add_dependency 'lograge', '~> 0.5'
|
36
|
+
spec.add_dependency 'oj', '~> 3.10.0'
|
37
|
+
spec.add_dependency 'thor', '~> 1.0'
|
39
38
|
|
40
39
|
spec.add_development_dependency 'bundler', '~> 1.14'
|
41
40
|
spec.add_development_dependency 'rake', '~> 10.0'
|
data/example/sample.rb
CHANGED
data/lib/docker-fluent-logger.rb
CHANGED
@@ -1,4 +1,6 @@
|
|
1
|
-
require '
|
1
|
+
require 'json'
|
2
|
+
require 'logger'
|
3
|
+
require 'oj'
|
2
4
|
|
3
5
|
require 'docker-fluent-logger/cli'
|
4
6
|
require 'docker-fluent-logger/payload'
|
@@ -6,6 +8,18 @@ require 'docker-fluent-logger/version'
|
|
6
8
|
|
7
9
|
module DockerFluentLogger
|
8
10
|
def self.create
|
9
|
-
|
11
|
+
logger = Logger.new(STDOUT)
|
12
|
+
|
13
|
+
logger.formatter = proc do |severity, datetime, progname, message|
|
14
|
+
data = {
|
15
|
+
severity: severity,
|
16
|
+
timestamp: datetime.utc.iso8601(6),
|
17
|
+
message: message
|
18
|
+
}
|
19
|
+
data[:progname] = progname unless progname.nil?
|
20
|
+
"#{Oj.dump(data, mode: :compat)}\n"
|
21
|
+
end
|
22
|
+
|
23
|
+
logger
|
10
24
|
end
|
11
25
|
end
|
@@ -2,11 +2,10 @@ require 'thor'
|
|
2
2
|
|
3
3
|
module DockerFluentLogger
|
4
4
|
class CLI < Thor
|
5
|
-
desc 'install', '
|
5
|
+
desc 'install', 'Install file'
|
6
6
|
def install
|
7
7
|
current_dir = Pathname(File.dirname(__FILE__))
|
8
8
|
|
9
|
-
# lograte.rb
|
10
9
|
src_path = current_dir.join('generator', 'templates', 'lograge.rb')
|
11
10
|
dest_path = Pathname('config').join('initializers', 'lograge.rb')
|
12
11
|
|
@@ -4,10 +4,12 @@ Rails.application.configure do
|
|
4
4
|
config.lograge.logger = ActiveSupport::Logger.new(STDOUT)
|
5
5
|
config.lograge.enabled = true
|
6
6
|
config.lograge.keep_original_rails_log = false
|
7
|
-
config.lograge.formatter = Lograge::Formatters::
|
7
|
+
config.lograge.formatter = Lograge::Formatters::Json.new
|
8
8
|
|
9
9
|
config.lograge.custom_options = lambda do |event|
|
10
10
|
data = {
|
11
|
+
timestamp: event.payload[:timestamp],
|
12
|
+
hostname: event.payload[:hostname],
|
11
13
|
uuid: event.payload[:uuid],
|
12
14
|
url: event.payload[:url],
|
13
15
|
remote_ip: event.payload[:remote_ip],
|
@@ -1,14 +1,23 @@
|
|
1
1
|
module DockerFluentLogger
|
2
2
|
module Payload
|
3
|
+
def append_payload_error(e)
|
4
|
+
@payload_exception = [e.class.name, e.message]
|
5
|
+
@payload_exception_object = e
|
6
|
+
end
|
7
|
+
|
3
8
|
def append_info_to_payload(payload)
|
4
9
|
super
|
5
10
|
|
11
|
+
payload[:timestamp] = Time.now.utc.iso8601(6)
|
12
|
+
payload[:hostname] = Socket.gethostname
|
6
13
|
payload[:uuid] = request.uuid
|
7
14
|
payload[:url] = request.url
|
8
15
|
payload[:referer] = request.referer
|
9
16
|
payload[:remote_ip] = request.remote_ip
|
10
17
|
payload[:user_agent] = request.user_agent
|
11
18
|
payload[:session_id] = session.id if session.present?
|
19
|
+
payload[:exception] = @payload_exception if @payload_exception.present?
|
20
|
+
payload[:exception_object] = @payload_exception_object if @payload_exception_object.present?
|
12
21
|
end
|
13
22
|
end
|
14
23
|
end
|
metadata
CHANGED
@@ -1,29 +1,29 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: docker-fluent-logger
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 1.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- naomichi-y
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2020-12-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
-
name:
|
14
|
+
name: activesupport
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version:
|
19
|
+
version: 5.0.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - "
|
24
|
+
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version:
|
26
|
+
version: 5.0.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: lograge
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -39,47 +39,33 @@ dependencies:
|
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '0.5'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name:
|
42
|
+
name: oj
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: 3.10.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
54
|
+
version: 3.10.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
|
-
name:
|
56
|
+
name: thor
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '1.
|
61
|
+
version: '1.0'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '1.
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: activesupport
|
71
|
-
requirement: !ruby/object:Gem::Requirement
|
72
|
-
requirements:
|
73
|
-
- - ">="
|
74
|
-
- !ruby/object:Gem::Version
|
75
|
-
version: 5.0.0
|
76
|
-
type: :runtime
|
77
|
-
prerelease: false
|
78
|
-
version_requirements: !ruby/object:Gem::Requirement
|
79
|
-
requirements:
|
80
|
-
- - ">="
|
81
|
-
- !ruby/object:Gem::Version
|
82
|
-
version: 5.0.0
|
68
|
+
version: '1.0'
|
83
69
|
- !ruby/object:Gem::Dependency
|
84
70
|
name: bundler
|
85
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -144,10 +130,12 @@ executables:
|
|
144
130
|
extensions: []
|
145
131
|
extra_rdoc_files: []
|
146
132
|
files:
|
133
|
+
- ".bundle/config"
|
147
134
|
- ".gitignore"
|
148
135
|
- ".rspec"
|
149
136
|
- ".rubocop.yml"
|
150
137
|
- Gemfile
|
138
|
+
- Gemfile.lock
|
151
139
|
- LICENSE.txt
|
152
140
|
- README.md
|
153
141
|
- Rakefile
|
@@ -158,7 +146,6 @@ files:
|
|
158
146
|
- exe/docker-fluent-logger
|
159
147
|
- lib/docker-fluent-logger.rb
|
160
148
|
- lib/docker-fluent-logger/cli.rb
|
161
|
-
- lib/docker-fluent-logger/generator/.DS_Store
|
162
149
|
- lib/docker-fluent-logger/generator/templates/lograge.rb
|
163
150
|
- lib/docker-fluent-logger/payload.rb
|
164
151
|
- lib/docker-fluent-logger/version.rb
|
@@ -181,10 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
181
168
|
- !ruby/object:Gem::Version
|
182
169
|
version: '0'
|
183
170
|
requirements: []
|
184
|
-
|
185
|
-
rubygems_version: 2.5.1
|
171
|
+
rubygems_version: 3.0.3
|
186
172
|
signing_key:
|
187
173
|
specification_version: 4
|
188
174
|
summary: Transfer docker log to Flutend
|
189
175
|
test_files: []
|
190
|
-
has_rdoc:
|
Binary file
|