Skip to content

Commit

Permalink
fix log4bash warning + added missing track and trace command
Browse files Browse the repository at this point in the history
  • Loading branch information
RoanKanninga committed May 12, 2021
1 parent 7371e90 commit 78e4e55
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
20 changes: 12 additions & 8 deletions bin/copyRawDataToPrm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,11 @@ function splitSamplesheetPerProject() {
# * either only demultiplexing was requested via the samplesheet
# * or when disabled on the commandline by enabling "archiveMode".
#
if [[ "${archiveMode}" == 'false' ]]; then
for _project in "${_projects[@]}"
do

printf '%s\n' "${_project},${_run},,,,,," \
>> "${JOB_CONTROLE_FILE_BASE}.trace_post_projects.csv"

for _project in "${_projects[@]}"
do

if [[ "${archiveMode}" == 'false' ]]; then
#
# Skip project if demultiplexing only.
#
Expand All @@ -321,11 +320,16 @@ function splitSamplesheetPerProject() {
mv "${_projectSampleSheet}"{.tmp,}
log4Bash 'INFO' "${LINENO}" "${FUNCNAME:-main}" '0' "Created ${_projectSampleSheet}."
fi
done
fi
fi
printf '%s\n' "${_project},${_run},,,,,," \
>> "${JOB_CONTROLE_FILE_BASE}.trace_post_projects.csv"

done

#
# Track and Trace.
#

local _allProjects
_allProjects="${_projects[*]}"
_allProjects="${_allProjects// /,}"
Expand Down
4 changes: 2 additions & 2 deletions bin/notifications.sh
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ function notification() {
#
if [[ ! -e "${_controlFileBase}.trackAndTrace.failed" && ! -e "${_controlFileBase}.sendEmail.failed" ]]
then
log4Bash 'INFO' "${LINENO}" "${FUNCNAME[0]:-main}" '0' "${SCRIPT_NAME} succeeded for the last processed phase:state combination (for which notifications were configured) of ${_project}/${_run}." \
log4Bash 'INFO' "${LINENO}" "${FUNCNAME[0]:-main}" '0' " Beware that notifications for previously processed phase:state combinations may have failed."
log4Bash 'INFO' "${LINENO}" "${FUNCNAME[0]:-main}" '0' "${SCRIPT_NAME} succeeded for the last processed phase:state combination (for which notifications were configured) of ${_project}/${_run}."
log4Bash 'INFO' "${LINENO}" "${FUNCNAME[0]:-main}" '0' "Beware that notifications for previously processed phase:state combinations may have failed."

log4Bash 'DEBUG' "${LINENO}" "${FUNCNAME[0]:-main}" '0' "Created ${JOB_CONTROLE_FILE_BASE}.finished."
else
Expand Down

0 comments on commit 78e4e55

Please sign in to comment.