Merge branch 'maint-rel-1.6' into develop
Conflicts: utilities/LoadTesting/scripts/_captureTomcatLogs
This commit is contained in:
commit
05ba1d0f03
2 changed files with 66 additions and 93 deletions
|
@ -12,11 +12,22 @@ directory, for possible inspection later.
|
|||
|
||||
require File.expand_path('subscripts/common', File.dirname(__FILE__))
|
||||
require 'date'
|
||||
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
|
||||
|
||||
def figure_time_stamp()
|
||||
return DateTime.now.strftime("%Y-%m-%d_%H-%M-%S")
|
||||
end
|
||||
|
||||
def add_read_me()
|
||||
puts "Add a comment for the README.txt file"
|
||||
comment = STDIN.gets.strip
|
||||
return if comment.empty?
|
||||
|
||||
File.open('README.txt', "w") do |file|
|
||||
file.puts comment
|
||||
end
|
||||
end
|
||||
|
||||
@tomcat_logs_dir = version_file('tomcatLogs')
|
||||
if (! File.directory?(@tomcat_logs_dir))
|
||||
Dir.mkdir(@tomcat_logs_dir)
|
||||
|
@ -29,5 +40,5 @@ end
|
|||
|
||||
Dir.chdir(@this_logs_dir) do |path|
|
||||
system("cp #{@home}/tomcat/logs/* .")
|
||||
add_read_me()
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue