From 7c868e2de5c7310c022773cd6fff3f36f0a27814 Mon Sep 17 00:00:00 2001
From: Matthew K Defenderfer <mdefende@uab.edu>
Date: Fri, 4 Oct 2024 11:13:20 -0500
Subject: [PATCH] set up raw directory for policy log to be stored in. change
 some ordering on permission changes

---
 src/run-policy/run-mmpol.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/run-policy/run-mmpol.sh b/src/run-policy/run-mmpol.sh
index f0acb90..1073e9c 100755
--- a/src/run-policy/run-mmpol.sh
+++ b/src/run-policy/run-mmpol.sh
@@ -102,7 +102,7 @@ tmpscratch="${outdir}/slurm-tmp-${SLURM_JOBID}"
 nodes=$(scontrol show hostnames "${SLURM_JOB_NODELIST}" | tr '\n' ',' | sed -e 's/,$//')
 cores="${SLURM_CPUS_PER_TASK}"
 
-DATESTR=$(date +'%Y%m%dT%H%M%S')
+DATESTR=$(date +'%Y-%m-%dT%H:%M:%S')
 
 policy=$(basename ${policy_file})
 filetag="${policy}_slurm-${SLURM_JOBID}_${DATESTR}"
@@ -124,17 +124,19 @@ if [[ ! ${dry_run} ]]; then
     ${cmd}
 
     log_name="${output_log_prefix}_${filetag}"
-    log_dir="${outdir}/${log_name}.d"
+    log_dir="${outdir}/${log_name}"
 
-    mkdir ${log_dir}
+    mkdir -p ${log_dir}/raw
     chmod 1770 ${log_dir}
 
     # tag output file with run metadata
     raw_log_file=$(find ${outdir} -maxdepth 1 -name "list-${SLURM_JOBID}*" -type f | head -1)
     if [[ "$raw_log_file" != "" ]]; then
-        mv -n ${raw_log_file} ${log_dir}/${log_name}
-        chmod 440 ${log_dir}/${log_name}
-        gzip ${log_dir}/${log_name}
+        mv -n ${raw_log_file} ${log_dir}/raw/${log_name}
+        gzip ${log_dir}/raw/${log_name}
+
+        chmod 440 ${log_dir}/raw/${log_name}.gz
+        chmod 550 ${log_dir}/raw
     fi
 
     chown -R ${USER}:atlab ${log_dir}
-- 
GitLab