Merge branch 'oom-fix'

Glyn Normington · Glyn Normington · commit 39a7dd57e534 · 2013-06-27T16:45:03.000+01:00
diff --git a/lib/java_buildpack/buildpack.rb b/lib/java_buildpack/buildpack.rb
@@ -38,7 +38,7 @@ def initialize(app_dir)
       Buildpack.require_component_files
       components = Buildpack.components
 
-      java_home = String.new
+      java_home = ''
       java_opts = Array.new
 
       @jres = components['jres'].map do |jre|
@@ -127,6 +127,7 @@ def release
     # @param [Hash, String] log_data Data to be logged
     def self.log(log_title, log_data)
       File.open(@@buildpack_log_file, 'a') do |log_file|
+        log_file.sync = true
         log_file.write "#{log_title} @ #{time_in_millis}::\n"
         log_file.write(log_data.is_a?(Hash) ? log_data.to_yaml: log_data)
       end
@@ -147,6 +148,7 @@ def self.create_log_file(app_dir)
 
       # Create new log file and write current time into it.
       File.open(@@buildpack_log_file, 'a') do |log_file|
+        log_file.sync = true
         log_file.write "#{@@buildpack_log_file} @ #{time_in_millis}\n"
       end
     end
diff --git a/lib/java_buildpack/jre/openjdk.rb b/lib/java_buildpack/jre/openjdk.rb
@@ -69,7 +69,7 @@ def compile
     #
     # @return [void]
     def release
-      @java_opts << "-XX:OnOutOfMemoryError=#{@diagnostics_dir}/killjava"
+      @java_opts << "-XX:OnOutOfMemoryError=$HOME/buildpack-diagnostics/killjava"
       @java_opts.concat memory(@configuration)
     end
 
diff --git a/resources/openjdk/diagnostics/killjava b/resources/openjdk/diagnostics/killjava
@@ -20,11 +20,11 @@ $stdout.sync = true
 
 module Kill
 
-  def Kill.log(log_title, log_data)
+  def Kill.log(log_data)
     log_file = "#{File.dirname(__FILE__)}/buildpack.log"
     File.open(log_file, 'a') do |log_file|
-      log_file.write "#{log_title} @ #{Kill.time_in_millis}::\n"
-      log_file.write(log_data)
+      log_file.sync = true
+      log_file.write "#{log_data} @ #{Kill.time_in_millis}\n"
     end
   end
 
@@ -35,10 +35,11 @@ module Kill
 end
 
 begin
-  Kill.log("#{__FILE__} attempting to kill Java processes",
-           `pkill -9 -f .*-XX:OnOutOfMemoryError=.*#{File.basename(__FILE__)}`)
+  command = "pkill -9 -f .*-XX:OnOutOfMemoryError=.*#{File.basename(__FILE__)}"
+  Kill.log("#{__FILE__} attempting to kill Java processes using `#{command}`")
+  `#{command}`
 rescue => e
-  Kill.log("#{__FILE__} failed with exception", "#{e.inspect}, #{e.backtrace}\n")
+  Kill.log("#{__FILE__} failed with exception #{e.inspect}, #{e.backtrace}\n")
   abort e.message
 end
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ def compile`
`69`	`69`	`#`
`70`	`70`	`# @return [void]`
`71`	`71`	`def release`
`72`		`- @java_opts << "-XX:OnOutOfMemoryError=#{@diagnostics_dir}/killjava"`
	`72`	`+ @java_opts << "-XX:OnOutOfMemoryError=$HOME/buildpack-diagnostics/killjava"`
`73`	`73`	`@java_opts.concat memory(@configuration)`
`74`	`74`	`end`
`75`	`75`