diff --git a/pom.xml b/pom.xml index 9fc68441..b91a51a3 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,19 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-log4j2 + + org.springframework spring-webmvc 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - - - - - - - - - - DEBUG - - - - %d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) [%thread] (%file:%line\) - %m%n - - - - - - - %d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) [%thread] (%file:%line\) - %m%n - - - ERROR - ACCEPT - DENY - - - ${ROOT}%d/error.%d.log - ${MAXHISTORY} - - - - - - - - - - [%-5level] %d{${DATETIME}} [%thread] %logger{36} - %m%n - - - WARN - ACCEPT - DENY - - - ${ROOT}%d/warn.%d.log - ${MAXHISTORY} - - - - - - - - - - %d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) [%thread] (%file:%line\) - %m%n - - - INFO - ACCEPT - DENY - - - ${ROOT}%d/info.%d.log - ${MAXHISTORY} - - - - - - - - - %d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) [%thread] (%file:%line\) - %m%n - - - DEBUG - ACCEPT - DENY - - - ${ROOT}%d/debug.%d.log - ${MAXHISTORY} - - - - - - - - - - [%-5level] %d{${DATETIME}} [%thread] - %m%n - - - - DEBUG - ACCEPT - DENY - - - ${ROOT}%d/httpclient.%d.log - ${MAXHISTORY} - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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