You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/06/04 06:14:11 UTC
[servicecomb-java-chassis] 03/06: [SCB-1978]specify container name
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit 77f8f2847a05ad13737fee68e7460c1ee9ce77b5
Author: liubao <bi...@qq.com>
AuthorDate: Wed Jun 3 15:31:03 2020 +0800
[SCB-1978]specify container name
---
.../demo-multi-service-center-client/pom.xml | 2 +
.../src/main/resources/logback.xml | 50 ----------------------
.../src/main/resources/logback.xml | 50 ----------------------
3 files changed, 2 insertions(+), 100 deletions(-)
diff --git a/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml b/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml
index ed2f75d..d6b89d2 100644
--- a/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml
+++ b/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml
@@ -78,6 +78,7 @@
<name>servicecomb/service-center</name>
<alias>service-center-01</alias>
<run>
+ <containerNamePattern>%a</containerNamePattern>
<wait>
<log>server is ready</log>
<tcp>
@@ -96,6 +97,7 @@
<name>servicecomb/service-center</name>
<alias>service-center-02</alias>
<run>
+ <containerNamePattern>%a</containerNamePattern>
<wait>
<log>server is ready</log>
<tcp>
diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverA/src/main/resources/logback.xml b/demo/demo-multi-service-center/demo-multi-service-center-serverA/src/main/resources/logback.xml
deleted file mode 100644
index 0d627f2..0000000
--- a/demo/demo-multi-service-center/demo-multi-service-center-serverA/src/main/resources/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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 scan="true">
- <appender name="STDOUT-TRACING" class="ch.qos.logback.core.ConsoleAppender">
- <!-- If applicable, can use ch.qos.logback.classic.filter.MarkerFilter -->
- <filter class="org.apache.servicecomb.foundation.logback.MarkerFilter">
- <Marker>SERVICECOMB_MARKER</Marker>
- <OnMismatch>DENY</OnMismatch>
- <OnMatch>ACCEPT</OnMatch>
- </filter>
-
- <encoder>
- <pattern>%d [%level] [%thread][%X{SERVICECOMB_TRACE_ID}] - %msg (%F:%L\)%n</pattern>
- </encoder>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- If applicable, can use ch.qos.logback.classic.filter.MarkerFilter -->
- <filter class="org.apache.servicecomb.foundation.logback.MarkerFilter">
- <Marker>SERVICECOMB_MARKER</Marker>
- <OnMismatch>ACCEPT</OnMismatch>
- <OnMatch>DENY</OnMatch>
- </filter>
-
- <encoder>
- <pattern>%d [%level] [%thread] - %msg (%F:%L\)%n</pattern>
- </encoder>
- </appender>
-
- <root level="info">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="STDOUT-TRACING"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/logback.xml b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/logback.xml
deleted file mode 100644
index 0d627f2..0000000
--- a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/resources/logback.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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 scan="true">
- <appender name="STDOUT-TRACING" class="ch.qos.logback.core.ConsoleAppender">
- <!-- If applicable, can use ch.qos.logback.classic.filter.MarkerFilter -->
- <filter class="org.apache.servicecomb.foundation.logback.MarkerFilter">
- <Marker>SERVICECOMB_MARKER</Marker>
- <OnMismatch>DENY</OnMismatch>
- <OnMatch>ACCEPT</OnMatch>
- </filter>
-
- <encoder>
- <pattern>%d [%level] [%thread][%X{SERVICECOMB_TRACE_ID}] - %msg (%F:%L\)%n</pattern>
- </encoder>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- If applicable, can use ch.qos.logback.classic.filter.MarkerFilter -->
- <filter class="org.apache.servicecomb.foundation.logback.MarkerFilter">
- <Marker>SERVICECOMB_MARKER</Marker>
- <OnMismatch>ACCEPT</OnMismatch>
- <OnMatch>DENY</OnMatch>
- </filter>
-
- <encoder>
- <pattern>%d [%level] [%thread] - %msg (%F:%L\)%n</pattern>
- </encoder>
- </appender>
-
- <root level="info">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="STDOUT-TRACING"/>
- </root>
-</configuration>
\ No newline at end of file