bosh_cpi 1.2546.0 → 1.2549.0

data/lib/bosh/cpi/cli.rb

@@ -28,8 +28,9 @@ class Bosh::Cpi::Cli
   INVALID_CALL_ERROR_TYPE = 'InvalidCall'.freeze
   UNKNOWN_ERROR_TYPE      = 'Unknown'.freeze
 
-  def initialize(cpi, result_io)
+  def initialize(cpi, logs_string_io, result_io)
     @cpi = cpi
+    @logs_string_io = logs_string_io
     @result_io = result_io
   end
 
@@ -92,6 +93,7 @@ class Bosh::Cpi::Cli
         message: message,
         ok_to_retry: ok_to_retry,
       },
+      log: @logs_string_io.string,
     }
     @result_io.print(JSON.dump(hash)); nil
   end
@@ -100,6 +102,7 @@ class Bosh::Cpi::Cli
     hash = {
       result: result,
       error: nil,
+      log: @logs_string_io.string,
     }
     @result_io.print(JSON.dump(hash)); nil
   end

data/lib/cloud/config.rb

@@ -5,7 +5,7 @@ module Bosh::Clouds
 
     class << self
       extend Forwardable
-      def_delegators :@delegate, :db, :logger, :uuid, :uuid=, :task_checkpoint
+      def_delegators :@delegate, :db, :logger, :uuid, :uuid=, :task_checkpoint, :cpi_task_log
     end
 
     # @param [Bosh::Director::Config] config director config file

data/lib/cloud/external_cpi.rb

@@ -53,7 +53,8 @@ module Bosh::Clouds
             'message' => String,
             'ok_to_retry' => bool
           }
-        )
+        ),
+        'log' => String
       }
     end
 
@@ -87,6 +88,8 @@ module Bosh::Clouds
           handle_error(parsed_response['error'])
         end
 
+        save_cpi_log(parsed_response['log'])
+
         parsed_response['result']
       end
     end
@@ -118,6 +121,14 @@ module Bosh::Clouds
       raise error, error_message
     end
 
+    def save_cpi_log(output)
+      # cpi log path is set up at the beginning of every task in Config
+      # see JobRunner#setup_task_logging
+      File.open(Config.cpi_task_log, 'a') do |f|
+        f.write(output)
+      end
+    end
+
     def parsed_response(input)
       begin
         JSON.load(input)

data/lib/cloud/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Clouds
-    VERSION = '1.2546.0'
+    VERSION = '1.2549.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2546.0
+  version: 1.2549.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2546.0
+        version: 1.2549.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,10 +26,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2546.0
+        version: 1.2549.0
 description: ! 'BOSH CPI
 
-  e8aedb'
+  0d3835'
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -941851252333260636
+      hash: 3737853131911870421
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23