You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/12/06 23:50:32 UTC
[airavata] branch develop updated (2a7f51d -> ccb09a9)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 2a7f51d Deleting GroupOwner model
new 84ddb3a AIRAVATA-2608 Fix Zookeeper download url
new ccb09a9 AIRAVATA-2608 totalSizeCap of 1GB on airavata log files
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 ++-
dev-tools/ansible/roles/zookeeper/vars/main.yml | 2 +-
modules/configuration/server/src/main/resources/logback.xml | 3 ++-
modules/distribution/src/main/resources/bin/airavata-server-start.sh | 2 +-
7 files changed, 10 insertions(+), 5 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@airavata.apache.org" <co...@airavata.apache.org>'].
[airavata] 02/02: AIRAVATA-2608 totalSizeCap of 1GB on airavata log
files
Posted by ma...@apache.org.
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 <ma...@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" <co...@airavata.apache.org>.
[airavata] 01/02: AIRAVATA-2608 Fix Zookeeper download url
Posted by ma...@apache.org.
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 84ddb3a94f7d08e75faa386562eaa13c6dce4ad5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Dec 6 15:50:45 2017 -0500
AIRAVATA-2608 Fix Zookeeper download url
---
dev-tools/ansible/roles/zookeeper/vars/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-tools/ansible/roles/zookeeper/vars/main.yml b/dev-tools/ansible/roles/zookeeper/vars/main.yml
index 3331fa4..6646e27 100644
--- a/dev-tools/ansible/roles/zookeeper/vars/main.yml
+++ b/dev-tools/ansible/roles/zookeeper/vars/main.yml
@@ -22,7 +22,7 @@
#Variables associated with this role
# zookeeper related variable
zookeeper_version: 3.4.8
-zookeeper_url: http://www.us.apache.org/dist/zookeeper/zookeeper-{{zookeeper_version}}/zookeeper-{{zookeeper_version}}.tar.gz
+zookeeper_url: https://archive.apache.org/dist/zookeeper/zookeeper-{{zookeeper_version}}/zookeeper-{{zookeeper_version}}.tar.gz
apt_cache_timeout: 3600
client_port: "{{ zookeeper_client_port }}"
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.