ref: refs/heads/master
commit 54365ac2c78007339ce586f04af18cc0af805ab8
Author: Josef Reidinger
Date: Tue Jul 14 14:04:20 2009 +0200
make exception logger more universal
---
webclient/lib/exception_logger.rb | 14 ++++++--------
webclient/lib/proxy_loader.rb | 5 ++---
webclient/lib/yast/service_resource.rb | 3 +--
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/webclient/lib/exception_logger.rb b/webclient/lib/exception_logger.rb
index cd318e7..3011698 100644
--- a/webclient/lib/exception_logger.rb
+++ b/webclient/lib/exception_logger.rb
@@ -1,18 +1,16 @@
# = ExceptionLogger module
-# Provides unified way to log exception in controller.
-# == requirements
-# Should be used only in controller. (TODO make it more universal)
+# Provides unified way to log exception in application.
# == Usage
# Just add log_exception method with Exception as argument and it write informations
# to log
#
# rescue Exception => e
-# log_exception e
+# ExceptionLogger.log_exception e
-module ExceptionLogger
- def log_exception e
- logger.warn e.message
- logger.info e.backtrace.join("\n")
+class ExceptionLogger
+ def ExceptionLogger.log_exception e
+ Rails.logger.warn e.message
+ Rails.logger.info e.backtrace.join("\n")
end
end
diff --git a/webclient/lib/proxy_loader.rb b/webclient/lib/proxy_loader.rb
index 5449901..d3ec01e 100644
--- a/webclient/lib/proxy_loader.rb
+++ b/webclient/lib/proxy_loader.rb
@@ -16,7 +16,6 @@
#
module ProxyLoader
- include ExceptionLogger
#Finds proxy and find its result.
#_fields_:: set @+permissions+ field to permissions of proxy
#name:: Name of proxy
@@ -38,10 +37,10 @@ module ProxyLoader
ret = proxy.find
rescue ActiveResource::ClientError => e
flash[:error] = YaST::ServiceResource.error(e)
- log_exception e
+ ExceptionLogger.log_exception e
rescue Exception => e
flash[:error] = e.message
- log_exception e
+ ExceptionLogger.log_exception e
end
return ret
diff --git a/webclient/lib/yast/service_resource.rb b/webclient/lib/yast/service_resource.rb
index eac26d0..2ce5e34 100644
--- a/webclient/lib/yast/service_resource.rb
+++ b/webclient/lib/yast/service_resource.rb
@@ -69,8 +69,7 @@ module YaST
resource = self.resource_for_interface(interface_name)
raise "null resource, should throw inside resource_for_interface" unless resource
rescue Exception => e
- Rails.logger.warn e.message
- Rails.logger.warn e.backtrace.join("\n")
+ ExceptionLogger::log_exception e
return nil
end
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
