From 04c5fa229a5ca2d43249b4945de7a1a0109dd853 Mon Sep 17 00:00:00 2001
From: wmqwxb <13628607970@163.com>
Date: Thu, 14 Dec 2023 17:24:49 +0800
Subject: [PATCH 1/2] update reader.yaml

Signed-off-by: wmqwxb <13628607970@163.com>
---
 static/reader.yaml | 133 ++++++++++-----------------------------------
 1 file changed, 30 insertions(+), 103 deletions(-)

diff --git a/static/reader.yaml b/static/reader.yaml
index 41ff4433..0efcd3a0 100644
--- a/static/reader.yaml
+++ b/static/reader.yaml
@@ -7,130 +7,57 @@ component:
   roles:
     - guest
     - host
+    - arbiter
   parameters:
-    dtype:
-      type: parameter_dtype
-      default: float32
-      optional: true
-      description: ''
-      type_meta:
-        title: parameter_dtype
-        type: object
-        properties:
-          data:
-            title: Data
-            default: float32
-            type: string
-    label_type:
-      type: parameter_label_type
-      default: float32
-      optional: true
-      description: ''
-      type_meta:
-        title: parameter_label_type
-        type: object
-        properties:
-          data:
-            title: Data
-            default: float32
-            type: string
-    label_name:
-      type: parameter_label_name
-      default:
-      optional: true
-      description: ''
-      type_meta:
-        title: parameter_label_name
-        type: object
-        properties:
-          data:
-            title: Data
-            type: string
-        required:
-          - data
-    delimiter:
-      type: parameter_delimiter
-      default: ','
-      optional: true
-      description: ''
-      type_meta:
-        title: parameter_delimiter
-        type: object
-        properties:
-          data:
-            title: Data
-            default: ','
-            type: string
-    match_id_name:
-      type: parameter_match_id_name
-      default:
-      optional: true
-      description: ''
-      type_meta:
-        title: parameter_match_id_name
-        type: object
-        properties:
-          data:
-            title: Data
-            type: string
-        required:
-          - data
-    sample_id_name:
-      type: parameter_sample_id_name
+    name:
+      type: str
       default:
-      optional: true
-      description: ''
-      type_meta:
-        title: parameter_sample_id_name
-        type: object
-        properties:
-          data:
-            title: Data
-            type: string
-        required:
-          - data
-    format:
-      type: parameter_format
-      default: csv
       optional: false
       description: ''
       type_meta:
-        title: parameter_format
-        type: object
-        properties:
-          data:
-            title: Data
-            default: csv
-            type: string
-    path:
-      type: parameter_path
+        title: str
+        type: string
+        default:
+        description: ''
+    namespace:
+      type: str
       default:
       optional: false
       description: ''
       type_meta:
-        title: parameter_path
-        type: object
-        properties:
-          data:
-            title: Data
-            type: string
-        required:
-          - data
+        title: str
+        type: string
+        default:
+        description: ''
   input_artifacts:
     data: {}
     model: {}
   output_artifacts:
     data:
       output_data:
-        type: dataframe
+        types:
+          - data_unresolved
         optional: false
         stages:
           - default
         roles:
           - guest
           - host
+          - arbiter
         description: ''
         is_multi: false
     model: {}
-    metric: {}
-schema_version: v1
\ No newline at end of file
+    metric:
+      metric:
+        types:
+          - json_metric
+        optional: false
+        stages:
+          - default
+        roles:
+          - guest
+          - host
+          - arbiter
+        description: metric, invisible for user
+        is_multi: false
+schema_version: v1

From 3ededdeef711ef340c565e86c00c1b96e4302bf5 Mon Sep 17 00:00:00 2001
From: "Signed-off-by: wmqwxb" <13628607970@163.com>
Date: Fri, 15 Dec 2023 17:50:18 +0800
Subject: [PATCH 2/2] logback to lgo4j

Signed-off-by: wmqwxb <13628607970@163.com>
---
 pom.xml                        |  12 +++
 src/main/resources/log4j2.xml  |  84 +++++++++++++++++++++
 src/main/resources/logback.xml | 134 ---------------------------------
 3 files changed, 96 insertions(+), 134 deletions(-)
 create mode 100644 src/main/resources/log4j2.xml
 delete mode 100644 src/main/resources/logback.xml

diff --git a/pom.xml b/pom.xml
index 9fc68441..b91a51a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 00000000..152f9186
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2019 The FATE Authors. All Rights Reserved.
+  ~
+  ~ 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.
+  -->
+<Configuration status="ERROR" monitorInterval="60">
+    <Appenders>
+        <Console name="console" target="SYSTEM_OUT">
+            <PatternLayout charset="UTF-8" pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%-5p] %c{1.}(%F:%L) - %m%n"/>
+        </Console>
+
+        <RollingFile name="info" fileName="logs/info.log"
+                     filePattern="logs/%d{yyyy-MM-dd}/info.log">
+            <PatternLayout charset="UTF-8" pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%-5p] %c{1.}(%F:%L) - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <DefaultRolloverStrategy max="24"/>
+        </RollingFile>
+
+        <RollingFile name="error" fileName="logs/error.log"
+                     filePattern="logs/%d{yyyy-MM-dd}/error.log">
+            <PatternLayout charset="UTF-8" pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%-5p] %c{1.}(%F:%L) - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <DefaultRolloverStrategy max="24"/>
+        </RollingFile>
+
+        <RollingFile name="debug" fileName="logs/debug.log"
+                     filePattern="logs/%d{yyyy-MM-dd}/debug.log">
+            <PatternLayout charset="UTF-8" pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%-5p] %c{1.}(%F:%L) - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <DefaultRolloverStrategy max="24"/>
+        </RollingFile>
+
+            <RollingFile name="warn" fileName="logs/warn.log"
+                     filePattern="logs/%d{yyyy-MM-dd}/warn.log">
+            <PatternLayout charset="UTF-8" pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%-5p] %c{1.}(%F:%L) - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <DefaultRolloverStrategy max="24"/>
+        </RollingFile>
+
+        <RollingFile name="httpclient" fileName="logs/httpclient.log"
+                     filePattern="logs/%d{yyyy-MM-dd}/httpclient.log">
+            <PatternLayout charset="UTF-8" pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%-5p] %c{1.}(%F:%L) - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+            </Policies>
+            <DefaultRolloverStrategy max="24"/>
+        </RollingFile>
+
+    </Appenders>
+
+    <Loggers>
+
+        <AsyncLogger name="org.fedai.fate.board.conf.FeignConfig" level="debug" additivity="true">
+            <AppenderRef ref="httpclient"/>
+        </AsyncLogger>
+
+        <AsyncRoot level="info" includeLocation="true">
+            <AppenderRef ref="console" level="info"/>
+            <AppenderRef ref="info" level="info"/>
+            <AppenderRef ref="error" level="error"/>
+            <AppenderRef ref="debug" level="debug"/>
+            <AppenderRef ref="warn" level="warn"/>
+        </AsyncRoot>
+    </Loggers>
+</Configuration>
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
deleted file mode 100644
index 59d37ec2..00000000
--- a/src/main/resources/logback.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd"
-        debug="false" scan="true" scanPeriod="30 second">
-
-    <!--    <property name="PROJECT" value="fateboard"/>-->
-    <property name="ROOT" value="logs/"/>
-    <property name="FILESIZE" value="50MB"/>
-    <property name="MAXHISTORY" value="100"/>
-    <timestamp key="DATETIME" datePattern="yyyy-MM-dd HH:mm:ss"/>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>DEBUG</level>
-        </filter>
-        <encoder charset="utf-8">
-            <!--<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n</pattern>-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) [%thread] (%file:%line\) - %m%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder charset="utf-8">
-            <!--<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n</pattern>-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) [%thread] (%file:%line\) - %m%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${ROOT}%d/error.%d.log</fileNamePattern>
-            <maxHistory>${MAXHISTORY}</maxHistory>
-            <!--            <timeBasedFileNamingAndTriggeringPolicy-->
-            <!--                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
-            <!--                <maxFileSize>${FILESIZE}</maxFileSize>-->
-            <!--            </timeBasedFileNamingAndTriggeringPolicy>-->
-        </rollingPolicy>
-    </appender>
-
-    <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder charset="utf-8">
-            <pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>WARN</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${ROOT}%d/warn.%d.log</fileNamePattern>
-            <maxHistory>${MAXHISTORY}</maxHistory>
-            <!--            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
-            <!--                <maxFileSize>${FILESIZE}</maxFileSize>-->
-            <!--            </timeBasedFileNamingAndTriggeringPolicy>-->
-        </rollingPolicy>
-    </appender>
-
-    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder charset="utf-8">
-            <!--<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n</pattern>-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) [%thread] (%file:%line\) - %m%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${ROOT}%d/info.%d.log</fileNamePattern>
-            <maxHistory>${MAXHISTORY}</maxHistory>
-            <!--            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
-            <!--                <maxFileSize>${FILESIZE}</maxFileSize>-->
-            <!--            </timeBasedFileNamingAndTriggeringPolicy>-->
-        </rollingPolicy>
-    </appender>
-    <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder charset="utf-8">
-            <!--<pattern>[%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n</pattern>-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) [%thread] (%file:%line\) - %m%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>DEBUG</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${ROOT}%d/debug.%d.log</fileNamePattern>
-            <maxHistory>${MAXHISTORY}</maxHistory>
-            <!--            <timeBasedFileNamingAndTriggeringPolicy-->
-            <!--                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
-            <!--                <maxFileSize>${FILESIZE}</maxFileSize>-->
-            <!--            </timeBasedFileNamingAndTriggeringPolicy>-->
-        </rollingPolicy>
-    </appender>
-
-    <appender name="httpclient" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder charset="utf-8">
-            <pattern>[%-5level] %d{${DATETIME}} [%thread] - %m%n
-            </pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>DEBUG</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <rollingPolicy
-                class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${ROOT}%d/httpclient.%d.log</fileNamePattern>
-            <maxHistory>${MAXHISTORY}</maxHistory>
-            <!--            <timeBasedFileNamingAndTriggeringPolicy-->
-            <!--                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
-            <!--                <maxFileSize>${FILESIZE}</maxFileSize>-->
-            <!--            </timeBasedFileNamingAndTriggeringPolicy>-->
-        </rollingPolicy>
-    </appender>
-
-    <logger name="org.fedai.fate.board.conf.FeignConfig" level="DEBUG" additivity="true">
-        <appender-ref ref="httpclient"/>
-    </logger>
-
-    <!--    <logger name="org.mybatis.spring" level="INFO" additivity="false"/>-->
-
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="ERROR"/>
-        <appender-ref ref="WARN"/>
-        <appender-ref ref="INFO"/>
-        <!--        <appender-ref ref="DEBUG"/>-->
-    </root>
-</configuration>
\ No newline at end of file