This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 962e43be3b fix agent service bug when connecting to airavata server.
962e43be3b is described below
commit 962e43be3ba4c175f2eec30557720c47ea1f69a8
Author: yasithdev <[email protected]>
AuthorDate: Mon Jul 14 06:03:08 2025 -0500
fix agent service bug when connecting to airavata server.
---
.../agent/connection/service/services/AiravataService.java | 9 +++++----
.../agent-service/src/main/resources/application.yml | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
index 8cac7d198d..e49f014eab 100644
---
a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
+++
b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java
@@ -28,8 +28,6 @@ import java.util.stream.Stream;
import org.apache.airavata.agent.connection.service.UserContext;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.ServerSettings;
import
org.apache.airavata.model.appcatalog.groupresourceprofile.GroupComputeResourcePreference;
import
org.apache.airavata.model.appcatalog.groupresourceprofile.GroupResourceProfile;
import org.apache.airavata.model.error.AiravataClientException;
@@ -53,10 +51,13 @@ public class AiravataService {
@Value("${airavata.server.port:8930}")
private int port;
+ @Value("${airavata.server.secure:false}")
+ private boolean secure;
+
public Airavata.Client airavata() {
try {
- return AiravataClientFactory.createAiravataClient(serverUrl, port,
ServerSettings.isTLSEnabled());
- } catch (AiravataClientException | ApplicationSettingsException e) {
+ return AiravataClientFactory.createAiravataClient(serverUrl, port,
secure);
+ } catch (AiravataClientException e) {
LOGGER.error("Error while creating Airavata client", e);
throw new RuntimeException("Error while creating Airavata client",
e);
}
diff --git
a/modules/agent-framework/agent-service/src/main/resources/application.yml
b/modules/agent-framework/agent-service/src/main/resources/application.yml
index ed863d3649..f730d50837 100644
--- a/modules/agent-framework/agent-service/src/main/resources/application.yml
+++ b/modules/agent-framework/agent-service/src/main/resources/application.yml
@@ -45,6 +45,7 @@ airavata:
server:
url: airavata.host
port: 8930
+ secure: false
storageResourceId: airavata.host_77116e91-f042-4d3a-ab9c-3e7b4ebcd5bd
storagePath: /tmp
cluster:
