This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch agent-framewok-refactoring
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/agent-framewok-refactoring by
this push:
new 138fb60e19 Removing incompatible libraries from the agent service
138fb60e19 is described below
commit 138fb60e19c6459f0104f5f26702d0797dd58eb7
Author: Dimuthu Wannipurage <[email protected]>
AuthorDate: Mon Sep 16 21:19:43 2024 -0400
Removing incompatible libraries from the agent service
---
modules/agent-framework/agent-service/pom.xml | 16 +++++++
.../main/assembly/agent-service-bin-assembly.xml | 1 +
...n-service-daemon.sh => agent-service-daemon.sh} | 6 +--
.../{connection-service.sh => agent-service.sh} | 2 +-
.../src/main/resources/distribution/bin/setenv.sh | 0
.../main/resources/distribution/conf/log4j2.xml | 53 ++++++++++++++++++++++
6 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/modules/agent-framework/agent-service/pom.xml
b/modules/agent-framework/agent-service/pom.xml
index 167d08871b..4807f9cc81 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -53,6 +53,14 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -63,6 +71,14 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/modules/agent-framework/agent-service/src/main/assembly/agent-service-bin-assembly.xml
b/modules/agent-framework/agent-service/src/main/assembly/agent-service-bin-assembly.xml
index 0d47334a4b..6fee2fb3a5 100644
---
a/modules/agent-framework/agent-service/src/main/assembly/agent-service-bin-assembly.xml
+++
b/modules/agent-framework/agent-service/src/main/assembly/agent-service-bin-assembly.xml
@@ -59,6 +59,7 @@
<includes>
<include>application.yml</include>
<include>truststore.jks</include>
+ <include>log4j2.xml</include>
</includes>
</fileSet>
<fileSet>
diff --git
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/connection-service-daemon.sh
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service-daemon.sh
old mode 100644
new mode 100755
similarity index 92%
rename from
modules/agent-framework/agent-service/src/main/resources/distribution/bin/connection-service-daemon.sh
rename to
modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service-daemon.sh
index 63a4a0e767..58d12bba30
---
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/connection-service-daemon.sh
+++
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service-daemon.sh
@@ -41,7 +41,7 @@ case $1 in
echo "Starting $SERVICE_NAME ..."
if [ ! -f $PID_PATH_NAME ]; then
nohup java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
-
org.apache.airavata.agent.connection.service.ConnectionServiceApplication
${AIRAVATA_COMMAND} $* > $LOG_FILE 2>&1 &
+
org.apache.airavata.agent.connection.service.AgentServiceApplication
${AIRAVATA_COMMAND} $* > $LOG_FILE 2>&1 &
echo $! > $PID_PATH_NAME
echo "$SERVICE_NAME started ..."
else
@@ -90,7 +90,7 @@ case $1 in
rm $PID_PATH_NAME
echo "$SERVICE_NAME starting ..."
nohup java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
-
org.apache.airavata.agent.connection.service.ConnectionServiceApplication
${AIRAVATA_COMMAND} $* > $LOG_FILE 2>&1 &
+
org.apache.airavata.agent.connection.service.AgentServiceApplication
${AIRAVATA_COMMAND} $* > $LOG_FILE 2>&1 &
echo $! > $PID_PATH_NAME
echo "$SERVICE_NAME started ..."
else
@@ -98,7 +98,7 @@ case $1 in
fi
;;
-h)
- echo "Usage: connection-service-daemon.sh"
+ echo "Usage: agent-service-daemon.sh"
echo "command options:"
echo " start Start server in daemon mode"
diff --git
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/connection-service.sh
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
old mode 100644
new mode 100755
similarity index 95%
rename from
modules/agent-framework/agent-service/src/main/resources/distribution/bin/connection-service.sh
rename to
modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
index c725442b86..d0006811c4
---
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/connection-service.sh
+++
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/agent-service.sh
@@ -67,4 +67,4 @@ do
done
java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
- org.apache.airavata.agent.connection.service.ConnectionServiceApplication
${AIRAVATA_COMMAND} $*
\ No newline at end of file
+ org.apache.airavata.agent.connection.service.AgentServiceApplication
${AIRAVATA_COMMAND} $*
\ No newline at end of file
diff --git
a/modules/agent-framework/agent-service/src/main/resources/distribution/bin/setenv.sh
b/modules/agent-framework/agent-service/src/main/resources/distribution/bin/setenv.sh
old mode 100644
new mode 100755
diff --git
a/modules/agent-framework/agent-service/src/main/resources/distribution/conf/log4j2.xml
b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/log4j2.xml
new file mode 100644
index 0000000000..e38f7ff011
--- /dev/null
+++
b/modules/agent-framework/agent-service/src/main/resources/distribution/conf/log4j2.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<Configuration status="WARN">
+
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
+ </Console>
+ <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+
filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
+ <PatternLayout>
+ <Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <TimeBasedTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="50 MB" />
+ </Policies>
+ <DefaultRolloverStrategy max="20" />
+ </RollingFile>
+ </Appenders>
+ <Loggers>
+ <logger name="ch.qos.logback" level="WARN"/>
+ <logger name="org.apache.helix" level="WARN"/>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFileAppender"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
