Skip to content

Commit c88ea9e

Browse files
committed
Extract out logging functionality.
1 parent a96e0f0 commit c88ea9e

File tree

2 files changed

+32
-4
lines changed

2 files changed

+32
-4
lines changed

lib/rubydns/extensions/logger.rb

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright (c) 2009, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
2+
#
3+
# Permission is hereby granted, free of charge, to any person obtaining a copy
4+
# of this software and associated documentation files (the "Software"), to deal
5+
# in the Software without restriction, including without limitation the rights
6+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
# copies of the Software, and to permit persons to whom the Software is
8+
# furnished to do so, subject to the following conditions:
9+
#
10+
# The above copyright notice and this permission notice shall be included in
11+
# all copies or substantial portions of the Software.
12+
#
13+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
# THE SOFTWARE.
20+
21+
module RubyDNS
22+
# Logs an exception nicely.
23+
def self.log_exception(logger, exception)
24+
logger.error "#{exception.class}: #{exception.message}"
25+
if exception.backtrace
26+
Array(exception.backtrace).each { |at| logger.error at }
27+
end
28+
29+
end
30+
end

lib/rubydns/server.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
# THE SOFTWARE.
2020

2121
require 'rubydns/transaction'
22+
require 'rubydns/extensions/logger'
2223

2324
module RubyDNS
2425

@@ -213,10 +214,7 @@ def process_query(query, options = {}, &block)
213214
transaction.errback do |response|
214215
if Exception === response
215216
@logger.error "Exception thrown while processing #{transaction}!"
216-
@logger.error "#{response.class}: #{response.message}"
217-
if response.backtrace
218-
Array(response.backtrace).each { |at| @logger.error at }
219-
end
217+
RubyDNS.log_exception(@logger, response)
220218
else
221219
@logger.error "Failure while processing #{transaction}!"
222220
@logger.error "#{response.inspect}"

0 commit comments

Comments
 (0)