Modify the log file storage path

Change-Id: Ie158d1b2dec04bf0f88acfd94bb655829c8dec17
Signed-off-by: huangjian <huang.jian12@zte.com.cn>

diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
index 01a87b3..863fff9 100644 (file)
--- a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
@@ -1,100 +1,100 @@
-#\r
-# Copyright 2016 [ZTE] and others.\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#     http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-#\r
-\r
-template: Hello, %s!\r
-\r
-defaultName: ${DW_DEFAULT_NAME:-Stranger}\r
-\r
-msbServerAddr: http://127.0.0.1:80\r
-\r
-httpServerAddr: http://127.0.0.1:8080\r
-\r
-opentoscaServerAddr: http://127.0.0.1:1337\r
-\r
-yamlParseAddr: http://127.0.0.1:8210\r
-\r
-parserType: zte\r
-\r
-ariaParserAddr: http://127.0.0.1:8204/openoapi/tosca/v1\r
-\r
-wso2HostIp: 127.0.0.1\r
-\r
-wso2HostPort: 9090\r
-\r
-#catalogue path to store csar temperarily\r
-cataloguePath: ./catalog\r
-httpServerPath: ../tomcat/webapps/ROOT/\r
-#database\r
-database:\r
-\r
-  # the name of your JDBC driver\r
-  driverClass: com.mysql.jdbc.Driver\r
-\r
-  # the username\r
-  user: catalog\r
-\r
-  # the password\r
-  password: catalog\r
-\r
-  # the JDBC URL\r
-  url: jdbc:mysql://127.0.0.1:3306/catalog\r
-#LDAP\r
-ldapServerIp: 127.0.0.1\r
-ldapServerPort: 20096\r
-ldapLogindn: uid=admin,ou=system\r
-ldapPassword: nsoc\r
-ldapVersion: 3\r
-\r
-# use the simple server factory if you only want to run on a single port\r
-#server:\r
-#  type: simple\r
-#  connector:\r
-#    type: http\r
-#    port: 8080\r
-server:\r
-  type: simple\r
-  rootPath: '/openoapi/catalog/v1/*'\r
-  applicationContextPath: /\r
-  adminContextPath: /admin\r
-  connector:\r
-    type: http\r
-    port: 8200\r
-\r
-# Logging settings.\r
-logging:\r
-\r
-  # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL.\r
-  level: ALL\r
-\r
-  # Logger-specific levels.\r
-  loggers:\r
-\r
-    # Sets the level for 'com.example.app' to DEBUG.\r
-    org.openo.commontosca.catalog.catalog.CatalogApp: INFO\r
-\r
-  appenders:\r
-    - type: console\r
-      threshold: INFO\r
-      timeZone: UTC\r
-      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %m%n"\r
-    - type: file\r
-      threshold: INFO\r
-      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %m%n"\r
-      currentLogFilename: ./logs/catalog.log\r
-      archivedLogFilenamePattern: ./logs/zip/catalog-%d{yyyy-MM-dd}.log.gz\r
-      archivedFileCount: 7\r
-      timeZone: UTC\r
-\r
+#
+# Copyright 2016 [ZTE] and others.
+#
+# Licensed 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.
+#
+
+template: Hello, %s!
+
+defaultName: ${DW_DEFAULT_NAME:-Stranger}
+
+msbServerAddr: http://127.0.0.1:80
+
+httpServerAddr: http://127.0.0.1:8080
+
+opentoscaServerAddr: http://127.0.0.1:1337
+
+yamlParseAddr: http://127.0.0.1:8210
+
+parserType: zte
+
+ariaParserAddr: http://127.0.0.1:8204/openoapi/tosca/v1
+
+wso2HostIp: 127.0.0.1
+
+wso2HostPort: 9090
+
+#catalogue path to store csar temperarily
+cataloguePath: ./catalog
+httpServerPath: ../tomcat/webapps/ROOT/
+#database
+database:
+
+  # the name of your JDBC driver
+  driverClass: com.mysql.jdbc.Driver
+
+  # the username
+  user: catalog
+
+  # the password
+  password: catalog
+
+  # the JDBC URL
+  url: jdbc:mysql://127.0.0.1:3306/catalog
+#LDAP
+ldapServerIp: 127.0.0.1
+ldapServerPort: 20096
+ldapLogindn: uid=admin,ou=system
+ldapPassword: nsoc
+ldapVersion: 3
+
+# use the simple server factory if you only want to run on a single port
+#server:
+#  type: simple
+#  connector:
+#    type: http
+#    port: 8080
+server:
+  type: simple
+  rootPath: '/openoapi/catalog/v1/*'
+  applicationContextPath: /
+  adminContextPath: /admin
+  connector:
+    type: http
+    port: 8200
+
+# Logging settings.
+logging:
+
+  # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL.
+  level: ALL
+
+  # Logger-specific levels.
+  loggers:
+
+    # Sets the level for 'com.example.app' to DEBUG.
+    org.openo.commontosca.catalog.catalog.CatalogApp: INFO
+
+  appenders:
+    - type: console
+      threshold: INFO
+      timeZone: UTC
+      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %m%n"
+    - type: file
+      threshold: INFO
+      logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %m%n"
+      currentLogFilename: ./works/logs/catalog.log
+      archivedLogFilenamePattern: ./works/logs/zip/catalog-%d{yyyy-MM-dd}.log.gz
+      archivedFileCount: 7
+      timeZone: UTC
+