update logging to stdout and file

Change-Id: Idf5af479feafb247b4430eeab6f9192e318192de
Signed-off-by: davidplunkett <dp7642@att.com>

diff --git a/tools/1prom-gen.sh b/tools/1prom-gen.sh
index 2040635..0e718fa 100755 (executable)
--- a/tools/1prom-gen.sh
+++ b/tools/1prom-gen.sh
@@ -19,10 +19,11 @@
 # re-generate prom config
 
 set -xe
-TIMESTAMP=$(date +"%Y%m%d%H%M")
-echo "logging to /var/log/yaml_builds/1prom-gen_$TIMESTAMP.log"
-mkdir -p /var/log/yaml_builds
-exec > /var/log/yaml_builds/1prom-gen_$TIMESTAMP.log
+LOGDIR="/var/log/yaml_builds"
+mkdir -p $LOGDIR
+LOGFILE="$LOGDIR/${1}_$(date +"%Y%m%d%H%M%z")_$(basename $0|cut -d. -f1)"
+echo "logging to $LOGFILE"
+exec 1> >(tee -a $LOGFILE)
 exec 2>&1
 
 source $(dirname $0)/setenv.sh
@@ -114,3 +115,8 @@ gen_certs
 gen_bundle
 create_scripts
 prepare_tar
+
+exec 2>&-
+exec 1>&-
+exit 0
+

diff --git a/tools/2genesis.sh b/tools/2genesis.sh
index 5f76311..4b05437 100755 (executable)
--- a/tools/2genesis.sh
+++ b/tools/2genesis.sh
@@ -16,10 +16,11 @@
 ##############################################################################
 
 set -xe
-TIMESTAMP=$(date +"%Y%m%d%H%M")
-echo "Logging to /var/log/yaml_builds/2genesis_$TIMESTAMP.log"
-mkdir -p /var/log/yaml_builds
-exec > /var/log/yaml_builds/2genesis_$TIMESTAMP.log
+LOGDIR="/var/log/yaml_builds"
+mkdir -p $LOGDIR
+LOGFILE="$LOGDIR/${1}_$(date +"%Y%m%d%H%M%z")_$(basename $0|cut -d. -f1)"
+echo "logging to $LOGFILE"
+exec 1> >(tee -a $LOGFILE)
 exec 2>&1
 
 source $(dirname $0)/setenv.sh
@@ -58,3 +59,8 @@ ssh $GENESIS_HOST << EOF
 EOF
 # Update BIOS Setting
 python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml
+
+exec 2>&-
+exec 1>&-
+exit 0
+

diff --git a/tools/3deploy_site.sh b/tools/3deploy_site.sh
index 5b10c9c..f1ef231 100755 (executable)
--- a/tools/3deploy_site.sh
+++ b/tools/3deploy_site.sh
@@ -17,6 +17,12 @@
 
 
 set -xe
+LOGDIR="/var/log/yaml_builds"
+mkdir -p $LOGDIR
+LOGFILE="$LOGDIR/${1}_$(date +"%Y%m%d%H%M%z")_$(basename $0|cut -d. -f1)"
+echo "logging to $LOGFILE"
+exec 1> >(tee -a $LOGFILE)
+exec 2>&1
 
 source $(dirname $0)/setenv.sh
 
@@ -42,3 +48,8 @@ ssh $GENESIS_HOST << EOF
   bash update_iptables.sh
   bash deploy_site.sh
 EOF
+
+exec 2>&-
+exec 1>&-
+exit 0
+