gray_logger 0.11.12 → 0.12.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.
Files changed (4) hide show
  1. data/lib/gray_logger/helper_methods.rb +5 -0
  2. data/lib/gray_logger/rack.rb +8 -1
  3. data/lib/gray_logger/railtie.rb +12 -4
  4. metadata +103 -108
data/lib/gray_logger/helper_methods.rb CHANGED
@@ -2,6 +2,11 @@ module GrayLogger
2
2
  module HelperMethods
3
3
 
4
4
  protected
5
+
6
+ def with_gray_logger
7
+ yield if defined?(gray_logger) && !gray_logger.nil?
8
+ end
9
+
5
10
  def gray_logger_proxy
6
11
  ::GrayLogger.proxy
7
12
  end
data/lib/gray_logger/rack.rb CHANGED
@@ -19,7 +19,14 @@ module Rack
19
19
  gray_logger.reset!
20
20
  status, headers, body = @app.call(env)
21
21
  rescue Exception => e
22
- gray_logger.log_exception(e) if gray_logger.automatic_logging?
22
+
23
+ # Ensure the original exception can be re-raised
24
+ begin
25
+ gray_logger.log_exception(e) if gray_logger.automatic_logging?
26
+ rescue
27
+ $stderr.puts "gray_logger threw an error and shouldn't"
28
+ end
29
+
23
30
  raise e
24
31
  ensure
25
32
  begin
data/lib/gray_logger/railtie.rb CHANGED
@@ -5,15 +5,23 @@ module GrayLogger
5
5
  begin
6
6
  initializer "gray_logger.configure_rails_initialization" do |app|
7
7
  configuration = YAML.load(File.read(Rails.root.join('config/gray_logger.yml')))[Rails.env]
8
- ::GrayLogger.configure(configuration)
9
- ::GrayLogger.proxy.initialize_gray_logger!
10
8
 
11
- ActionController::Base.send(:include, ::GrayLogger::HelperMethods)
9
+ if configuration.try(:key?, "enabled")
10
+ overrides = {}
11
+ overrides[:host] = ENV['GRAY_LOGGER_HOST'] if ENV['GRAY_LOGGER_HOST']
12
+ overrides[:port] = ENV['GRAY_LOGGER_PORT'] if ENV['GRAY_LOGGER_PORT']
13
+ overrides[:size] = ENV['GRAY_LOGGER_MAX_SIZE'] if ENV['GRAY_LOGGER_MAX_SIZE']
12
14
 
13
- app.middleware.insert_after "ActionDispatch::ShowExceptions", "Rack::GrayLogger::Middleware"
15
+ ::GrayLogger.configure(configuration.merge(overrides))
16
+ ::GrayLogger.proxy.initialize_gray_logger!
17
+
18
+ app.middleware.insert_after "ActionDispatch::ShowExceptions", "Rack::GrayLogger::Middleware"
19
+ end
14
20
  end
15
21
  rescue => e
16
22
  $stderr.puts("GrayLogger not configured. Please add config/gray_logger.yml")
23
+ ensure
24
+ ActionController::Base.send(:include, ::GrayLogger::HelperMethods)
17
25
  end
18
26
 
19
27
  end
metadata CHANGED
@@ -1,129 +1,134 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: gray_logger
3
- version: !ruby/object:Gem::Version
4
- hash: 43
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.12.0
5
5
  prerelease:
6
- segments:
7
- - 0
8
- - 11
9
- - 12
10
- version: 0.11.12
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Benjamin Behr
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-12-06 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2013-03-26 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: gelf
22
- version_requirements: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
23
17
  none: false
24
- requirements:
25
- - - ">="
26
- - !ruby/object:Gem::Version
27
- hash: 3
28
- segments:
29
- - 0
30
- version: "0"
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
31
22
  type: :runtime
32
- requirement: *id001
33
23
  prerelease: false
34
- - !ruby/object:Gem::Dependency
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
30
+ - !ruby/object:Gem::Dependency
35
31
  name: minitest
36
- version_requirements: &id002 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
37
33
  none: false
38
- requirements:
39
- - - ">="
40
- - !ruby/object:Gem::Version
41
- hash: 3
42
- segments:
43
- - 0
44
- version: "0"
34
+ requirements:
35
+ - - ! '>='
36
+ - !ruby/object:Gem::Version
37
+ version: '0'
45
38
  type: :development
46
- requirement: *id002
47
39
  prerelease: false
48
- - !ruby/object:Gem::Dependency
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
46
+ - !ruby/object:Gem::Dependency
49
47
  name: minitest-colorize
50
- version_requirements: &id003 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
51
49
  none: false
52
- requirements:
53
- - - ">="
54
- - !ruby/object:Gem::Version
55
- hash: 3
56
- segments:
57
- - 0
58
- version: "0"
50
+ requirements:
51
+ - - ! '>='
52
+ - !ruby/object:Gem::Version
53
+ version: '0'
59
54
  type: :development
60
- requirement: *id003
61
55
  prerelease: false
62
- - !ruby/object:Gem::Dependency
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
62
+ - !ruby/object:Gem::Dependency
63
63
  name: guard-minitest
64
- version_requirements: &id004 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
65
65
  none: false
66
- requirements:
67
- - - ">="
68
- - !ruby/object:Gem::Version
69
- hash: 3
70
- segments:
71
- - 0
72
- version: "0"
66
+ requirements:
67
+ - - ! '>='
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
73
70
  type: :development
74
- requirement: *id004
75
71
  prerelease: false
76
- - !ruby/object:Gem::Dependency
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
78
+ - !ruby/object:Gem::Dependency
77
79
  name: rake
78
- version_requirements: &id005 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
79
81
  none: false
80
- requirements:
81
- - - ">="
82
- - !ruby/object:Gem::Version
83
- hash: 3
84
- segments:
85
- - 0
86
- version: "0"
82
+ requirements:
83
+ - - ! '>='
84
+ - !ruby/object:Gem::Version
85
+ version: '0'
87
86
  type: :development
88
- requirement: *id005
89
87
  prerelease: false
90
- - !ruby/object:Gem::Dependency
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ! '>='
92
+ - !ruby/object:Gem::Version
93
+ version: '0'
94
+ - !ruby/object:Gem::Dependency
91
95
  name: growl
92
- version_requirements: &id006 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
93
97
  none: false
94
- requirements:
95
- - - ">="
96
- - !ruby/object:Gem::Version
97
- hash: 3
98
- segments:
99
- - 0
100
- version: "0"
98
+ requirements:
99
+ - - ! '>='
100
+ - !ruby/object:Gem::Version
101
+ version: '0'
101
102
  type: :development
102
- requirement: *id006
103
103
  prerelease: false
104
- - !ruby/object:Gem::Dependency
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
110
+ - !ruby/object:Gem::Dependency
105
111
  name: mocha
106
- version_requirements: &id007 !ruby/object:Gem::Requirement
112
+ requirement: !ruby/object:Gem::Requirement
107
113
  none: false
108
- requirements:
109
- - - ">="
110
- - !ruby/object:Gem::Version
111
- hash: 3
112
- segments:
113
- - 0
114
- version: "0"
114
+ requirements:
115
+ - - ! '>='
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
115
118
  type: :development
116
- requirement: *id007
117
119
  prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ! '>='
124
+ - !ruby/object:Gem::Version
125
+ version: '0'
118
126
  description: GrayLogger is a middleware for Rack to easily log custom stuff to Graylog2
119
127
  email: benny@digitalbehr.de
120
128
  executables: []
121
-
122
129
  extensions: []
123
-
124
130
  extra_rdoc_files: []
125
-
126
- files:
131
+ files:
127
132
  - lib/gray_logger/bucket.rb
128
133
  - lib/gray_logger/configuration.rb
129
134
  - lib/gray_logger/helper_methods.rb
@@ -140,36 +145,26 @@ files:
140
145
  - Rakefile
141
146
  homepage:
142
147
  licenses: []
143
-
144
148
  post_install_message:
145
149
  rdoc_options: []
146
-
147
- require_paths:
150
+ require_paths:
148
151
  - lib
149
- required_ruby_version: !ruby/object:Gem::Requirement
152
+ required_ruby_version: !ruby/object:Gem::Requirement
150
153
  none: false
151
- requirements:
152
- - - ">="
153
- - !ruby/object:Gem::Version
154
- hash: 3
155
- segments:
156
- - 0
157
- version: "0"
158
- required_rubygems_version: !ruby/object:Gem::Requirement
154
+ requirements:
155
+ - - ! '>='
156
+ - !ruby/object:Gem::Version
157
+ version: '0'
158
+ required_rubygems_version: !ruby/object:Gem::Requirement
159
159
  none: false
160
- requirements:
161
- - - ">="
162
- - !ruby/object:Gem::Version
163
- hash: 3
164
- segments:
165
- - 0
166
- version: "0"
160
+ requirements:
161
+ - - ! '>='
162
+ - !ruby/object:Gem::Version
163
+ version: '0'
167
164
  requirements: []
168
-
169
165
  rubyforge_project:
170
- rubygems_version: 1.8.24
166
+ rubygems_version: 1.8.25
171
167
  signing_key:
172
168
  specification_version: 3
173
169
  summary: Rack Middleware to log custom stuff to Graylog2
174
170
  test_files: []
175
-