Update version according to OSCI-856

[packages/precise/mcollective.git] / lib / mcollective / log.rb

diff --git a/lib/mcollective/log.rb b/lib/mcollective/log.rb
index 7e3d774c65ef4255a0af9ceb3b2df14ec1719439..efb84d2b52dbcdc0cbc6ffb3dfec16573e417fab 100644 (file)
--- a/lib/mcollective/log.rb
+++ b/lib/mcollective/log.rb
@@ -67,7 +67,8 @@ module MCollective
       def logexception(msgid, level, e, backtrace=false, args={})
         return false unless config_and_check_level(level)
 
-        origin = File.basename(e.backtrace[1])
+        path, line, method = e.backtrace[1].split(/:(\d+)/)
+        origin = "%s:%s%s" % [File.basename(path), line, method]
 
         if e.is_a?(CodedError)
           msg = "%s: %s" % [e.code, e.to_s]
@@ -161,7 +162,13 @@ module MCollective
 
       # figures out the filename that called us
       def from
-        from = File.basename(caller[2])
+        path, line, method = execution_stack[3].split(/:(\d+)/)
+        "%s:%s%s" % [File.basename(path), line, method]
+      end
+
+      # this method is here to facilitate testing
+      def execution_stack
+        caller
       end
     end
   end