From b88d06765ceede68d090eb766431a4f0d7cc8cb2 Mon Sep 17 00:00:00 2001
From: davidplunkett <dp7642@att.com>
Date: Fri, 29 Mar 2019 00:33:24 +0000
Subject: [PATCH] change log dir to /var/log/akraino

Change-Id: I0a4c55194d190040b8a41d6eb58532ae0f693753
Signed-off-by: davidplunkett <dp7642@att.com>
---
 tools/1prom-gen.sh          |  2 +-
 tools/2genesis.sh           |  2 +-
 tools/3deploy_site.sh       |  2 +-
 tools/single_step_deploy.sh |  8 ++++----
 tools/transfer.sh           | 14 ++++++++++----
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/tools/1prom-gen.sh b/tools/1prom-gen.sh
index 0e718fa..64f0b94 100755
--- a/tools/1prom-gen.sh
+++ b/tools/1prom-gen.sh
@@ -19,7 +19,7 @@
 # re-generate prom config
 
 set -xe
-LOGDIR="/var/log/yaml_builds"
+LOGDIR="/var/log/akraino"
 mkdir -p $LOGDIR
 LOGFILE="$LOGDIR/${1}_$(date +"%Y%m%d%H%M%z")_$(basename $0|cut -d. -f1)"
 echo "logging to $LOGFILE"
diff --git a/tools/2genesis.sh b/tools/2genesis.sh
index 4b05437..b4065ac 100755
--- a/tools/2genesis.sh
+++ b/tools/2genesis.sh
@@ -16,7 +16,7 @@
 ##############################################################################
 
 set -xe
-LOGDIR="/var/log/yaml_builds"
+LOGDIR="/var/log/akraino"
 mkdir -p $LOGDIR
 LOGFILE="$LOGDIR/${1}_$(date +"%Y%m%d%H%M%z")_$(basename $0|cut -d. -f1)"
 echo "logging to $LOGFILE"
diff --git a/tools/3deploy_site.sh b/tools/3deploy_site.sh
index f1ef231..06a95b0 100755
--- a/tools/3deploy_site.sh
+++ b/tools/3deploy_site.sh
@@ -17,7 +17,7 @@
 
 
 set -xe
-LOGDIR="/var/log/yaml_builds"
+LOGDIR="/var/log/akraino"
 mkdir -p $LOGDIR
 LOGFILE="$LOGDIR/${1}_$(date +"%Y%m%d%H%M%z")_$(basename $0|cut -d. -f1)"
 echo "logging to $LOGFILE"
diff --git a/tools/single_step_deploy.sh b/tools/single_step_deploy.sh
index cb2d8bb..e76bc9d 100755
--- a/tools/single_step_deploy.sh
+++ b/tools/single_step_deploy.sh
@@ -31,8 +31,8 @@ TIMESTAMP=$(date +"%Y%m%d%H%M")
 echo "TIMESTAMP=$TIMESTAMP"
 
 echo "Validating the setup and generating the tar file"
-mkdir -p /var/log/yaml_builds
-bash $YAML_BUILDS/tools/1prom-gen.sh $SITE > /var/log/yaml_builds/1prom-gen-$TIMESTAMP.log 2>&1
+mkdir -p /var/log/akraino
+bash $YAML_BUILDS/tools/1prom-gen.sh $SITE
 if [ $? -ne 0 ]
 then
   echo "Error:Could not generate tar file. So stopping here"
@@ -40,7 +40,7 @@ then
 fi
 
 echo "Bringing up the genesis node"
-bash $YAML_BUILDS/tools/2genesis.sh $SITE > /var/log/yaml_builds/2genesis-$TIMESTAMP.log 2>&1
+bash $YAML_BUILDS/tools/2genesis.sh $SITE
 if [ $? -ne 0 ]
 then
   echo "Error:Could not bringup the genesis nodes. So stopping here"
@@ -48,7 +48,7 @@ then
 fi
 
 echo "Deploying the site"
-bash $YAML_BUILDS/tools/3deploy_site.sh $SITE > /var/log/yaml_builds/3deploy-$TIMESTAMP.log 2>&1
+bash $YAML_BUILDS/tools/3deploy_site.sh $SITE
 if [ $? -ne 0 ]
 then
   echo "Error:Could not deploy the site."
diff --git a/tools/transfer.sh b/tools/transfer.sh
index dd43f01..6023bea 100755
--- a/tools/transfer.sh
+++ b/tools/transfer.sh
@@ -16,10 +16,11 @@
 ##############################################################################
 
 set -x
-TIMESTAMP=$(date +"%Y%m%d%H%M")
-echo "Logging to /var/log/yaml_builds/transfer_$TIMESTAMP.log"
-mkdir -p /var/log/yaml_builds
-exec > /var/log/yaml_builds/transfer_$TIMESTAMP.log
+LOGDIR="/var/log/akraino"
+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
@@ -53,3 +54,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
+
-- 
2.16.6