From 80e1ffe2d8e93f720acdbe59824f93b9a629ea14 Mon Sep 17 00:00:00 2001
From: ZeinebMESSAOUDI <130365664+Zeineb2001@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:34:59 +0100
Subject: [PATCH 1/4] Update the time of sleep

---
 .github/workflows/catalog-service-ci-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/catalog-service-ci-cd.yml b/.github/workflows/catalog-service-ci-cd.yml
index a4ca6950..966012c6 100644
--- a/.github/workflows/catalog-service-ci-cd.yml
+++ b/.github/workflows/catalog-service-ci-cd.yml
@@ -87,7 +87,7 @@ jobs:
             nohup java -jar service-catalog.jar --server.port=8082 > service-catalog.log 2>&1 &
             echo "Service deployed successfully!"
             
-            sleep 10
+            sleep 30
 
             echo "Performing health check..."
             curl -X 'GET'   'http://localhost:8082/products'   -H 'accept: /' || (echo "Service health check failed!" && exit 1)

From 1df1fd493b95703aa98e54264b2462530da7537c Mon Sep 17 00:00:00 2001
From: ZeinebMESSAOUDI <130365664+Zeineb2001@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:45:00 +0100
Subject: [PATCH 2/4] Verify the logs of microservice

---
 .github/workflows/catalog-service-ci-cd.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/catalog-service-ci-cd.yml b/.github/workflows/catalog-service-ci-cd.yml
index 966012c6..0605949d 100644
--- a/.github/workflows/catalog-service-ci-cd.yml
+++ b/.github/workflows/catalog-service-ci-cd.yml
@@ -93,3 +93,5 @@ jobs:
             curl -X 'GET'   'http://localhost:8082/products'   -H 'accept: /' || (echo "Service health check failed!" && exit 1)
 
             echo "Service deployed successfully!"
+            
+            tail -n 50 ~/service-catalog/service-catalog.log

From d8655294008dfbcde8c27b62a932766c62d8548b Mon Sep 17 00:00:00 2001
From: ZeinebMESSAOUDI <130365664+Zeineb2001@users.noreply.github.com>
Date: Sat, 30 Nov 2024 16:09:04 +0100
Subject: [PATCH 3/4] Stop any running service

---
 .github/workflows/catalog-service-ci-cd.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/catalog-service-ci-cd.yml b/.github/workflows/catalog-service-ci-cd.yml
index 0605949d..ba6b3372 100644
--- a/.github/workflows/catalog-service-ci-cd.yml
+++ b/.github/workflows/catalog-service-ci-cd.yml
@@ -79,7 +79,8 @@ jobs:
           username: ${{ secrets.DEPLOYMENT_MACHINE_USER }}
           password: ${{ secrets.DEPLOYMENT_MACHINE_USER_PSW }}
           script: |
-
+            echo "Stopping any running service..."
+            pkill -f "java -jar service-catalog.jar" || echo "No service to stop."
             sleep 10
 
             echo "Starting Java service..."

From 8c140d4683d01224917b01aa1def90e4460f54d2 Mon Sep 17 00:00:00 2001
From: ZeinebMESSAOUDI <130365664+Zeineb2001@users.noreply.github.com>
Date: Sat, 30 Nov 2024 16:25:09 +0100
Subject: [PATCH 4/4] Update catalog-service-ci-cd.yml

---
 .github/workflows/catalog-service-ci-cd.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/catalog-service-ci-cd.yml b/.github/workflows/catalog-service-ci-cd.yml
index ba6b3372..865ad119 100644
--- a/.github/workflows/catalog-service-ci-cd.yml
+++ b/.github/workflows/catalog-service-ci-cd.yml
@@ -79,8 +79,6 @@ jobs:
           username: ${{ secrets.DEPLOYMENT_MACHINE_USER }}
           password: ${{ secrets.DEPLOYMENT_MACHINE_USER_PSW }}
           script: |
-            echo "Stopping any running service..."
-            pkill -f "java -jar service-catalog.jar" || echo "No service to stop."
             sleep 10
 
             echo "Starting Java service..."