diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in index fdc5e860dea724a93bf636ab8c76fe89c10f5e6b..62472d869a02e62184f039f77a75014a7c470a86 100644 --- a/stack/erp5/instance-mariadb.cfg.in +++ b/stack/erp5/instance-mariadb.cfg.in @@ -252,7 +252,7 @@ mariadb-ssl = ${:etc}/mariadb-ssl var = ${buildout:directory}/var log = ${:var}/log run = ${:var}/run -slowquery = ${monitor-directory:private}/slowquerydex +slowquery = ${monitor-directory:private}/slowquery_digest [{{ section('resiliency-exclude-file') }}] # Generate rdiff exclude file in case of resiliency diff --git a/stack/erp5/mysql-querydigest.sh.in b/stack/erp5/mysql-querydigest.sh.in index afd5ceb32cd5eaa92e1178eb2b066cd2b0c0978e..b66dcecf9819c928f8517d12dce017552ce1e073 100644 --- a/stack/erp5/mysql-querydigest.sh.in +++ b/stack/erp5/mysql-querydigest.sh.in @@ -7,19 +7,20 @@ PT_QUERY_EXEC='{{pt_query_exec}}' if [ ! -d "$OUTPUT_FOLDER" ]; then echo "ERROR: output_folder don't exists" - exit 0 + exit 1 fi -OUTPUT_FILE=${OUTPUT_FOLDER}/slowquery_digest.txt - -TODAY=`date +%Y%m%d` +dashed_today=$(date +%Y-%m-%d) +today=$(date -d "$dashed_today" +%Y%m%d) -SLOW_LOG=$SLOW_QUERY_PATH-$TODAY +SLOW_LOG="$SLOW_QUERY_PATH-$today" +OUTPUT_FILE="$OUTPUT_FOLDER/slowquery_digest.txt-$dashed_today" if [ ! -f "$SLOW_LOG" ]; then echo "ERROR: cannot read mysql slow query log file $SLOW_LOG. Exiting." exit 1 fi -$PT_QUERY_EXEC $SLOW_LOG > $OUTPUT_FILE -echo "ok" +"$PT_QUERY_EXEC" "$SLOW_LOG" > "$OUTPUT_FILE" && \ +echo "Report generated successfully." || \ +echo "Report failed with code $?"