airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] 02/02: AIRAVATA-2608 totalSizeCap of 1GB on airavata log files
Date Wed, 06 Dec 2017 23:50:34 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit ccb09a94028fccad59fa99db76fdeeb1baa135a8
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Wed Dec 6 15:37:50 2017 -0500

    AIRAVATA-2608 totalSizeCap of 1GB on airavata log files
---
 dev-tools/ansible/roles/api-orch/defaults/main.yml                   | 1 +
 dev-tools/ansible/roles/api-orch/templates/logback.xml.j2            | 3 ++-
 dev-tools/ansible/roles/gfac/defaults/main.yml                       | 1 +
 dev-tools/ansible/roles/gfac/templates/logback.xml.j2                | 3 ++-
 modules/configuration/server/src/main/resources/logback.xml          | 3 ++-
 modules/distribution/src/main/resources/bin/airavata-server-start.sh | 2 +-
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev-tools/ansible/roles/api-orch/defaults/main.yml b/dev-tools/ansible/roles/api-orch/defaults/main.yml
index 9b62443..5602ce5 100644
--- a/dev-tools/ansible/roles/api-orch/defaults/main.yml
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@ -20,6 +20,7 @@
 
 api_orch_server_names: "api-orch"
 api_orch_log_dir: "{{ api_orch_dir }}/{{ airavata_dist }}/logs"
+api_orch_log_total_size_cap: "1GB"
 
 iam_server_url: "https://iam.scigap.org/auth"
 iam_server_super_admin_username: "admin"
diff --git a/dev-tools/ansible/roles/api-orch/templates/logback.xml.j2 b/dev-tools/ansible/roles/api-orch/templates/logback.xml.j2
index d66170e..b23f78e 100644
--- a/dev-tools/ansible/roles/api-orch/templates/logback.xml.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/logback.xml.j2
@@ -37,6 +37,7 @@
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>{{ api_orch_log_dir }}/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <totalSizeCap>{{ api_orch_log_total_size_cap }}</totalSizeCap>
         </rollingPolicy>
     </appender>
     <logger name="org.apache.zookeeper" level="ERROR"/>
@@ -49,7 +50,7 @@
     <logger name="httpclient.wire.header" level="ERROR"/>
     <logger name="org.apache.axis2.enterprise" level="ERROR"/>
     <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
+        <!--<appender-ref ref="CONSOLE"/>-->
         <appender-ref ref="LOGFILE"/>
     </root>
 </configuration>
diff --git a/dev-tools/ansible/roles/gfac/defaults/main.yml b/dev-tools/ansible/roles/gfac/defaults/main.yml
index 022cfcd..7a31ed7 100644
--- a/dev-tools/ansible/roles/gfac/defaults/main.yml
+++ b/dev-tools/ansible/roles/gfac/defaults/main.yml
@@ -19,4 +19,5 @@
 #
 
 gfac_log_dir: "{{ gfac_dir }}/{{ airavata_dist }}/logs"
+gfac_log_total_size_cap: "1GB"
 mariadb_connector_jar_url: "https://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar"
diff --git a/dev-tools/ansible/roles/gfac/templates/logback.xml.j2 b/dev-tools/ansible/roles/gfac/templates/logback.xml.j2
index 81b4929..6b9a422 100644
--- a/dev-tools/ansible/roles/gfac/templates/logback.xml.j2
+++ b/dev-tools/ansible/roles/gfac/templates/logback.xml.j2
@@ -37,6 +37,7 @@
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>{{ gfac_log_dir }}/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <totalSizeCap>{{ gfac_log_total_size_cap }}</totalSizeCap>
         </rollingPolicy>
     </appender>
     <logger name="org.apache.zookeeper" level="ERROR"/>
@@ -49,7 +50,7 @@
     <logger name="httpclient.wire.header" level="ERROR"/>
     <logger name="org.apache.axis2.enterprise" level="ERROR"/>
     <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
+        <!--<appender-ref ref="CONSOLE"/>-->
         <appender-ref ref="LOGFILE"/>
     </root>
 </configuration>
diff --git a/modules/configuration/server/src/main/resources/logback.xml b/modules/configuration/server/src/main/resources/logback.xml
index fa4ae1f..a2c5a7c 100644
--- a/modules/configuration/server/src/main/resources/logback.xml
+++ b/modules/configuration/server/src/main/resources/logback.xml
@@ -37,6 +37,7 @@
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
     </appender>
     <logger name="org.apache.zookeeper" level="ERROR"/>
@@ -49,7 +50,7 @@
     <logger name="httpclient.wire.header" level="ERROR"/>
     <logger name="org.apache.axis2.enterprise" level="ERROR"/>
     <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
+        <!--<appender-ref ref="CONSOLE"/>-->
         <appender-ref ref="LOGFILE"/>
     </root>
 </configuration>
diff --git a/modules/distribution/src/main/resources/bin/airavata-server-start.sh b/modules/distribution/src/main/resources/bin/airavata-server-start.sh
index 382e091..4812995 100644
--- a/modules/distribution/src/main/resources/bin/airavata-server-start.sh
+++ b/modules/distribution/src/main/resources/bin/airavata-server-start.sh
@@ -130,7 +130,7 @@ if ${IS_DAEMON_MODE} ; then
 	echo "Starting airavata server/s in daemon mode..."
 	echo "Redirecting output to $LOG_FILE"
 	nohup java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
-    org.apache.airavata.server.ServerMain ${AIRAVATA_COMMAND} $* >> $LOG_FILE 2>&1
&
+    org.apache.airavata.server.ServerMain ${AIRAVATA_COMMAND} $* > $LOG_FILE 2>&1
&
 else
 	java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
     org.apache.airavata.server.ServerMain ${AIRAVATA_COMMAND} $*

-- 
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <commits@airavata.apache.org>.

Mime
View raw message