From b08ea6e096a0e315b4b670df309be09ca95bef1c Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Tue, 1 Oct 2024 20:35:52 +0300
Subject: [PATCH] adding error code
---
.../sylva/SylvaMDResourceOperator.java | 17 +++++++++++------
src/main/resources/application.yml | 9 +++++++++
2 files changed, 20 insertions(+), 6 deletions(-)
create mode 100644 src/main/resources/application.yml
diff --git a/src/main/java/org/etsi/osl/controllers/sylva/SylvaMDResourceOperator.java b/src/main/java/org/etsi/osl/controllers/sylva/SylvaMDResourceOperator.java
index 93a3bc8..4779285 100644
--- a/src/main/java/org/etsi/osl/controllers/sylva/SylvaMDResourceOperator.java
+++ b/src/main/java/org/etsi/osl/controllers/sylva/SylvaMDResourceOperator.java
@@ -531,21 +531,26 @@ public class SylvaMDResourceOperator {
}
String command = "./apply-workload-cluster.sh " + deploymentFolderPath;
- int exitCode = execCLICommand(command).getExitCode();
-
+
+ ExecResult result = execCLICommand(command);
+
+ int exitCode = result.getExitCode();
+
+ //resource Kustomization/cr1ae2c130/sylva-units-status is ready!
+
+
if (exitCode == 0) {
log.info("Shell script executed successfully in {} for {}", WORKINGDIR_PATH,
deploymentFolderPath);
resourceClone = updateResourceStatus(resource, SylvaMDResourceState.ACTIVE,
"executing apply-workload-cluster.sh success ", client);
} else {
- log.error("Shell script execution failed in {} for {}. Exit code: {}", WORKINGDIR_PATH,
- deploymentFolderPath, exitCode);
+ log.error("Shell script execution failed in {} for {}. Exit code: {}, Last line: {}", WORKINGDIR_PATH,
+ deploymentFolderPath, exitCode, result.getLastLine());
resourceClone = updateResourceStatus(resource, SylvaMDResourceState.FAILED,
"executing apply-workload-cluster.sh failed", client);
-
}
return resource;
@@ -624,6 +629,7 @@ public class SylvaMDResourceOperator {
}
} catch (IOException e) {
e.printStackTrace();
+ log.info("==e> {}", e.getLocalizedMessage() );
}
});
@@ -647,7 +653,6 @@ public class SylvaMDResourceOperator {
errorThread.join();
-
if (exitCode == 0) {
log.info("execCLICommand executed successfully in {}: {}", WORKINGDIR_PATH, command);
} else {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 0000000..4bed356
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,9 @@
+spring:
+ application:
+ name: sylva-osl-operator
+ main:
+ web-application-type: none
+
+server:
+ port: 0
+
\ No newline at end of file
--
GitLab