On 08/01/2012 01:40 PM, [email protected] wrote:
From: Michal Fojtik <[email protected]>
This patch should prevent memory leaking caused
by repetetive driver loading on every request.
Signed-off-by: Michal fojtik <[email protected]>
---
server/lib/deltacloud/helpers/driver_helper.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/lib/deltacloud/helpers/driver_helper.rb
b/server/lib/deltacloud/helpers/driver_helper.rb
index 5c5e7c6..ab0e3c6 100644
--- a/server/lib/deltacloud/helpers/driver_helper.rb
+++ b/server/lib/deltacloud/helpers/driver_helper.rb
@@ -42,14 +42,14 @@ module Deltacloud::Helpers
m = Deltacloud::Drivers.const_get(driver_class_name)
m.const_get(driver_class_name + "Driver").new
rescue NameError
- raise "[ERROR] The driver class name is not defined as
#{driver_class_name}Driver"
+ nil
end
end
def driver
$:.unshift File.join(File.dirname(__FILE__), '..', '..')
begin
- require_relative driver_source_name
+ require_relative(driver_source_name) unless driver_class
driver_class
rescue LoadError => e
raise "[ERROR] The driver '#{driver_name}' is unknown or not installed
(#{driver_source_name})\n" +
ACK
