You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2021/12/17 05:27:05 UTC
[airavata] branch log4j-upgrade updated: Adding mistakenly deleted api-server start code
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch log4j-upgrade
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/log4j-upgrade by this push:
new 9860070 Adding mistakenly deleted api-server start code
9860070 is described below
commit 9860070afa84623db074726fe9cbbd0e33260fc9
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Fri Dec 17 00:26:57 2021 -0500
Adding mistakenly deleted api-server start code
---
dev-tools/ansible/roles/helix_setup/tasks/main.yml | 4 ++++
.../server/src/main/java/org/apache/airavata/server/ServerMain.java | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dev-tools/ansible/roles/helix_setup/tasks/main.yml b/dev-tools/ansible/roles/helix_setup/tasks/main.yml
index 10aa601..3eac566 100644
--- a/dev-tools/ansible/roles/helix_setup/tasks/main.yml
+++ b/dev-tools/ansible/roles/helix_setup/tasks/main.yml
@@ -48,6 +48,7 @@
- { command: ./bin/participant-daemon.sh stop, dir: "{{ helix_participant_version }}" }
- { command: ./bin/pre-wm-daemon.sh stop, dir: "{{ helix_pre_wm_version }}" }
- { command: ./bin/post-wm-daemon.sh stop, dir: "{{ helix_post_wm_version }}" }
+ - { command: ./bin/parser-wm-daemon.sh stop, dir: "{{ helix_parser_wm_version }}" }
ignore_errors: yes
- name: Delete lib, conf, bin directories of the distributions
@@ -67,6 +68,9 @@
- "{{ helix_post_wm_version }}/lib"
- "{{ helix_post_wm_version }}/bin"
- "{{ helix_post_wm_version }}/conf"
+ - "{{ helix_parser_wm_version }}/bin"
+ - "{{ helix_parser_wm_version }}/conf"
+ - "{{ helix_parser_wm_version }}/lib"
ignore_errors: yes
# Copy required distributions to the deployment directory
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 46c6e45..81be315 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -184,7 +184,9 @@ public class ServerMain {
CommandLineParameters commandLineParameters = StringUtil.getCommandLineParser(args);
if (commandLineParameters.getArguments().contains(STOP_COMMAND_STR)){
performServerStopRequest(commandLineParameters);
- }
+ } else {
+ performServerStart(args);
+ }
}