X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2F1prom-gen.sh;h=64f0b94df96a8f2b13756a32ffd8dbaff9bdbd4f;hb=65e9ce265e221f060686a69efce51f982c1833b0;hp=68ab018a5a265c15a98d4c59f7fdfb3a33ff12a5;hpb=1951ee4f75821702845cbf84243f7aadd032fd53;p=yaml_builds.git

diff --git a/tools/1prom-gen.sh b/tools/1prom-gen.sh
index 68ab018..64f0b94 100755
--- 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/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
@@ -104,7 +105,7 @@ create_scripts() {
 }
 
 prepare_tar(){
-   rm ./tars/promenade-bundle-$SITE.tar
+   rm -f ./tars/promenade-bundle-$SITE.tar
    tar cvf ./tars/promenade-bundle-$SITE.tar -C ./tars/$SITE .
 }
 
@@ -114,3 +115,8 @@ gen_certs
 gen_bundle
 create_scripts
 prepare_tar
+
+exec 2>&-
+exec 1>&-
+exit 0
+