From d580dde5c99aedb2c0b13901fb84c11403bfc74d Mon Sep 17 00:00:00 2001 From: Jung Seungho Date: Mon, 16 Jan 2017 13:08:10 +0900 Subject: [PATCH] modified log property and certificate path Change-Id: I8a0322b946e324afcdda32520bf90f7859dbcdd7 Signed-off-by: Jung Seungho Reviewed-on: https://gerrit.iotivity.org/gerrit/16421 Tested-by: jenkins-iotivity Reviewed-by: Jee Hyeok Kim (cherry picked from commit 3bb1fbe764edc51deb73e3704e5df65a17364600) Reviewed-on: https://gerrit.iotivity.org/gerrit/16483 Tested-by: jenkins-iotivity --- cloud/stack/src/main/java/log4j.properties | 14 +++++++------- .../main/java/org/iotivity/cloud/base/OICConstants.java | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cloud/stack/src/main/java/log4j.properties b/cloud/stack/src/main/java/log4j.properties index c8901fa..ba55652 100644 --- a/cloud/stack/src/main/java/log4j.properties +++ b/cloud/stack/src/main/java/log4j.properties @@ -1,11 +1,11 @@ # Root logger option -log4j.rootLogger=FATAL, file +log4j.rootLogger=FATAL, rolling # Redirect log messages to a log file, support file rolling. -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=./log/cloud.log -#log4j.appender.file.DatePattern='.'yyyy-MM-dd -log4j.appender.file.MaxFileSize=5MB -log4j.appender.file.MaxBackupIndex=10 -log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.rolling=org.apache.log4j.DailyRollingFileAppender +log4j.appender.rolling.File=./log/cloud.log +log4j.appender.rolling.DatePattern='.'yyyy-MM-dd +#log4j.appender.file.MaxFileSize=5MB +#log4j.appender.file.MaxBackupIndex=10 +log4j.appender.rolling.layout=org.apache.log4j.PatternLayout #log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n \ No newline at end of file diff --git a/cloud/stack/src/main/java/org/iotivity/cloud/base/OICConstants.java b/cloud/stack/src/main/java/org/iotivity/cloud/base/OICConstants.java index 24df58a..a9b2744 100755 --- a/cloud/stack/src/main/java/org/iotivity/cloud/base/OICConstants.java +++ b/cloud/stack/src/main/java/org/iotivity/cloud/base/OICConstants.java @@ -81,11 +81,11 @@ public class OICConstants { public static final String MQ_BROKER_URI = "ps"; /* file path for tls communication - Modify filePath to yours */ - public static final String ROOT_CERT_FILE = "./rootca.crt"; + public static final String ROOT_CERT_FILE = "../certificate/rootca.crt"; - public static final String CLOUD_CERT_FILE = "./iotivitycloud.crt"; + public static final String CLOUD_CERT_FILE = "../certificate/iotivitycloud.crt"; - public static final String CLOUD_KEY_FILE = "./iotivitycloud.key"; + public static final String CLOUD_KEY_FILE = "../certificate/iotivitycloud.key"; /* cloud uuid */ public static final String CLOUD_UUID = "2a6085d1-815d-4277-baba-4e4e4df91308"; -- 2.7.4