From aa8ab014391c303f58944fa8fc025c03aeef1314 Mon Sep 17 00:00:00 2001 From: Paurikova2 Date: Mon, 3 Feb 2025 11:51:32 +0100 Subject: [PATCH 1/5] save logs --- .github/actions/import-db/action.yml | 5 ++++- .github/workflows/deploy.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/actions/import-db/action.yml b/.github/actions/import-db/action.yml index 5fadbc3440b..b36d7935b86 100644 --- a/.github/actions/import-db/action.yml +++ b/.github/actions/import-db/action.yml @@ -51,7 +51,10 @@ runs: echo "cid=$cid" >> $GITHUB_OUTPUT sleep 60 echo "=====" - docker logs $DB5NAME || true + # Generate the current timestamp for the log filename + timestamp=$(date +"%y%m%d%H%M") + log_file="{{ inputs.LOGDIR }}python.log.${timestamp}" + docker logs $DB5NAME > "$log_file" || true echo "=====" # copy assetstore echo Preparing assetstore diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 011fe4cb807..c88f3422d76 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -121,6 +121,7 @@ jobs: INSTANCE: ${{ env.INSTANCE }} DATADIR: /opt/dspace-data/clarin-dspace/ ASSETSTORE: /opt/dspace-data/clarin-dspace/assetstore/ + LOGDIR: /log/ - name: dspace basic command run: | From fca181e5384c1c5701b709246fe07b6463686011 Mon Sep 17 00:00:00 2001 From: Paurikova2 Date: Mon, 3 Feb 2025 11:59:01 +0100 Subject: [PATCH 2/5] missing $ --- .github/actions/import-db/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/import-db/action.yml b/.github/actions/import-db/action.yml index b36d7935b86..d2d141cab7b 100644 --- a/.github/actions/import-db/action.yml +++ b/.github/actions/import-db/action.yml @@ -53,7 +53,7 @@ runs: echo "=====" # Generate the current timestamp for the log filename timestamp=$(date +"%y%m%d%H%M") - log_file="{{ inputs.LOGDIR }}python.log.${timestamp}" + log_file="${{ inputs.LOGDIR }}python.log.${timestamp}" docker logs $DB5NAME > "$log_file" || true echo "=====" # copy assetstore From 0a0ae970470eef2a26b89c70adb3c890699d3ba7 Mon Sep 17 00:00:00 2001 From: Paurikova2 Date: Mon, 3 Feb 2025 12:03:23 +0100 Subject: [PATCH 3/5] print log file name for check --- .github/actions/import-db/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/import-db/action.yml b/.github/actions/import-db/action.yml index d2d141cab7b..19fafc2292f 100644 --- a/.github/actions/import-db/action.yml +++ b/.github/actions/import-db/action.yml @@ -54,6 +54,7 @@ runs: # Generate the current timestamp for the log filename timestamp=$(date +"%y%m%d%H%M") log_file="${{ inputs.LOGDIR }}python.log.${timestamp}" + echo $log_file docker logs $DB5NAME > "$log_file" || true echo "=====" # copy assetstore From d04cbde786d05748c12c34f653b4b9d938da9117 Mon Sep 17 00:00:00 2001 From: Paurikova2 Date: Mon, 3 Feb 2025 12:13:01 +0100 Subject: [PATCH 4/5] removed superfluous space --- .github/actions/import-db/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/import-db/action.yml b/.github/actions/import-db/action.yml index 19fafc2292f..624c3b42bca 100644 --- a/.github/actions/import-db/action.yml +++ b/.github/actions/import-db/action.yml @@ -55,7 +55,7 @@ runs: timestamp=$(date +"%y%m%d%H%M") log_file="${{ inputs.LOGDIR }}python.log.${timestamp}" echo $log_file - docker logs $DB5NAME > "$log_file" || true + docker logs $DB5NAME > "$log_file" || true echo "=====" # copy assetstore echo Preparing assetstore From 333dcccc53d5119634f5e048b9cff3858db854d6 Mon Sep 17 00:00:00 2001 From: Paurikova2 Date: Tue, 4 Feb 2025 07:41:33 +0100 Subject: [PATCH 5/5] renamed log file -> added 'log' at the end of the name --- .github/actions/import-db/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/import-db/action.yml b/.github/actions/import-db/action.yml index 624c3b42bca..3b0252de4cd 100644 --- a/.github/actions/import-db/action.yml +++ b/.github/actions/import-db/action.yml @@ -53,7 +53,7 @@ runs: echo "=====" # Generate the current timestamp for the log filename timestamp=$(date +"%y%m%d%H%M") - log_file="${{ inputs.LOGDIR }}python.log.${timestamp}" + log_file="${{ inputs.LOGDIR }}python.${timestamp}.log" echo $log_file docker logs $DB5NAME > "$log_file" || true echo "====="