From a8908964f22a82e661d2b07b66b9bf4996a68983 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 29 Oct 2013 11:47:12 -0400 Subject: [PATCH] Refine the load-testing scripts --- .../LoadTesting/scripts/_captureTomcatLogs | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/utilities/LoadTesting/scripts/_captureTomcatLogs b/utilities/LoadTesting/scripts/_captureTomcatLogs index e5ddbbaf..55bcd656 100755 --- a/utilities/LoadTesting/scripts/_captureTomcatLogs +++ b/utilities/LoadTesting/scripts/_captureTomcatLogs @@ -10,6 +10,7 @@ directory, for possible inspection later. -------------------------------------------------------------------------------- =end +require File.expand_path('subscripts/common', File.dirname(__FILE__)) require 'date' require "#{File.dirname(__FILE__)}/subscripts/loadParms" @@ -17,19 +18,27 @@ def figure_time_stamp() return DateTime.now.strftime("%Y-%m-%d_%H-%M-%S") end -Dir.chdir("/home/jeb228/LoadTesting/versions/#{@version_name}") do |path| - @tomcat_logs_dir = "#{path}/tomcatLogs" - if (! File.directory?(@tomcat_logs_dir)) - Dir.mkdir(@tomcat_logs_dir) +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) +end + Dir.chdir(@tomcat_logs_dir) do |path| @this_logs_dir = "#{path}/#{figure_time_stamp()}" Dir.mkdir(@this_logs_dir) end Dir.chdir(@this_logs_dir) do |path| - system('cp ~/LoadTesting/tomcat/logs/* .') + system("cp #{@home}/tomcat/logs/* .") + add_read_me() end -