From a9809809a5ede84bb8a6ee0ccaca058fbb6fa50d Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 4 Jul 2025 16:01:47 +0900 Subject: [PATCH] git sync log creation update --- src/bin/git_sync.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/git_sync.sh b/src/bin/git_sync.sh index 23c99e5..cf1eac5 100755 --- a/src/bin/git_sync.sh +++ b/src/bin/git_sync.sh @@ -22,6 +22,7 @@ if [ ! -d "${GIT_REPOSITORY_FOLDER}" ]; then exit; fi; LOG_FILE="${GIT_WEBHOOK_BASE_FOLDER}${LOG_FOLDER}${REPOSITORY}.log"; +unique_id=$(uuidgen | tr -d '-' | head -c 8); # fetch to null # ${GIT_COMMAND} -C "${REPOSITORY_PATH}" fetch -q "${REMOTE}" "${BRANCH}"; @@ -32,11 +33,12 @@ GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${GIT_REPOSITORY_FOLDER}" "diff" "-- # changes=$(${GIT_COMMAND_BASE} -C "${REPOSITORY_PATH}" diff --stat HEAD "${REMOTE}"/"${BRANCH}"); changes=$("${GIT_COMMAND[@]}" 2>&1) if [ -n "${changes}" ]; then - echo "[$(date +"%Y-%m-%d %H:%M:%S")] [START] Changes ===>" &>> "$LOG_FILE"; + echo "[$(date +"%Y-%m-%d %H:%M:%S")] [${unique_id}] [START] Changes ===>" &>> "$LOG_FILE"; # ${GIT_COMMAND_BASE} -C "/${REPOSITORY_PATH}" merge "${REMOTE}"/"${BRANCH}" GIT_COMMAND=("${GIT_COMMAND_BASE[@]}" "-C" "${GIT_REPOSITORY_FOLDER}" merge "${REMOTE_NAME}/${BRANCH}") - "${GIT_COMMAND[@]}" &>> "$LOG_FILE"; - echo "[$(date +"%Y-%m-%d %H:%M:%S")] [END] ===>" &>> "$LOG_FILE"; + log_data=$("${GIT_COMMAND[@]}" 2>&1); + echo "[$(date +"%Y-%m-%d %H:%M:%S")] [${unique_id}] ${log_data}" &>> "$LOG_FILE"; + echo "[$(date +"%Y-%m-%d %H:%M:%S")] [${unique_id}] [END] ===>" &>> "$LOG_FILE"; fi; # __END__