From 1b5b1e25af654dbd517644d1ac367cf86fc2448f Mon Sep 17 00:00:00 2001 From: Baoqi Date: Tue, 16 Jul 2019 16:45:09 +0800 Subject: [PATCH 1/2] close 579, add combined server to simplify test --- escheduler-api/pom.xml | 8 +-- .../api/CombinedApplicationServer.java | 54 +++++++++++++++++++ .../api/configuration/AppConfiguration.java | 1 + .../api/controller/MetricsController.java | 4 ++ .../src/main/resources/combined_logback.xml | 54 +++++++++++++++++++ .../escheduler/server/rpc/LoggerServer.java | 2 +- .../build/webpack.config.combined.js | 26 +++++++++ escheduler-ui/package.json | 3 +- escheduler-ui/src/view/common/meta.inc | 8 +-- escheduler-ui/src/view/common/outro.inc | 2 +- package.xml | 8 +++ 11 files changed, 160 insertions(+), 10 deletions(-) create mode 100644 escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java create mode 100644 escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java create mode 100644 escheduler-api/src/main/resources/combined_logback.xml create mode 100644 escheduler-ui/build/webpack.config.combined.js diff --git a/escheduler-api/pom.xml b/escheduler-api/pom.xml index b0d92d54a8..2ac260f314 100644 --- a/escheduler-api/pom.xml +++ b/escheduler-api/pom.xml @@ -9,9 +9,11 @@ jar - - - + + cn.analysys + escheduler-alert + + cn.analysys escheduler-server diff --git a/escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java b/escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java new file mode 100644 index 0000000000..5f5927ea65 --- /dev/null +++ b/escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java @@ -0,0 +1,54 @@ +/* + * 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. + */ +package cn.escheduler.api; + +import cn.escheduler.alert.AlertServer; +import cn.escheduler.dao.ProcessDao; +import cn.escheduler.server.master.MasterServer; +import cn.escheduler.server.rpc.LoggerServer; +import cn.escheduler.server.worker.WorkerServer; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.ComponentScan; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@SpringBootApplication +@ServletComponentScan +@ComponentScan("cn.escheduler") +@EnableSwagger2 +public class CombinedApplicationServer extends SpringBootServletInitializer { + + public static void main(String[] args) throws Exception { + + ConfigurableApplicationContext context = SpringApplication.run(ApiApplicationServer.class, args); + ProcessDao processDao = context.getBean(ProcessDao.class); + MasterServer master = new MasterServer(processDao); + master.run(processDao); + + WorkerServer workerServer = new WorkerServer(); + workerServer.run(); + + LoggerServer server = new LoggerServer(); + server.start(); + + AlertServer alertServer = AlertServer.getInstance(); + alertServer.start(); + } +} diff --git a/escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java b/escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java index b9b69c0a9c..7010a9bcd2 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java @@ -84,6 +84,7 @@ public class AppConfiguration implements WebMvcConfigurer { registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/"); registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); + registry.addResourceHandler("/ui/**").addResourceLocations("file:ui/"); } @Override diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java b/escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java new file mode 100644 index 0000000000..000120720e --- /dev/null +++ b/escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java @@ -0,0 +1,4 @@ +package cn.escheduler.api.controller; + +public class MetricsController { +} diff --git a/escheduler-api/src/main/resources/combined_logback.xml b/escheduler-api/src/main/resources/combined_logback.xml new file mode 100644 index 0000000000..d9c5b80ecf --- /dev/null +++ b/escheduler-api/src/main/resources/combined_logback.xml @@ -0,0 +1,54 @@ + + + + + + + %highlight([%level]) %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{10}:[%line] - %msg%n + + UTF-8 + + + + + INFO + + + ${log.base}/{processDefinitionId}/{processInstanceId}/{taskInstanceId}.log + + + [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n + + UTF-8 + + true + + + + ${log.base}/escheduler-combined.log + + INFO + + + + ${log.base}/escheduler-combined.%d{yyyy-MM-dd_HH}.%i.log + 168 + 200MB + + 　　　　　 + + + [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n + + UTF-8 + + 　　 + + + + + + + + + \ No newline at end of file diff --git a/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java b/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java index 8913cdda06..ab9e79524b 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java +++ b/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java @@ -44,7 +44,7 @@ public class LoggerServer { */ private Server server; - private void start() throws IOException { + public void start() throws IOException { /* The port on which the server should run */ int port = Constants.RPC_PORT; server = ServerBuilder.forPort(port) diff --git a/escheduler-ui/build/webpack.config.combined.js b/escheduler-ui/build/webpack.config.combined.js new file mode 100644 index 0000000000..cae3eb92a8 --- /dev/null +++ b/escheduler-ui/build/webpack.config.combined.js @@ -0,0 +1,26 @@ +/* + * 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. + */ +const merge = require('webpack-merge') +const prodConfig = require('./webpack.config.prod') + +const config = merge.smart(prodConfig, { + output: { + publicPath: '/escheduler/ui/' + } +}) + +module.exports = config diff --git a/escheduler-ui/package.json b/escheduler-ui/package.json index 291c653b79..a824c2c5d4 100644 --- a/escheduler-ui/package.json +++ b/escheduler-ui/package.json @@ -10,7 +10,8 @@ "lint": "standard \"**/*.{js,vue}\"", "lint:fix": "standard \"**/*.{js,vue}\" --fix", "start": "npm run dev", - "combo": "node ./build/combo.js" + "combo": "node ./build/combo.js", + "build:combined": "npm run clean && cross-env NODE_ENV=production webpack --config ./build/webpack.config.combined.js" }, "dependencies": { "autoprefixer": "^9.1.0", diff --git a/escheduler-ui/src/view/common/meta.inc b/escheduler-ui/src/view/common/meta.inc index 62cdea7f8b..b0f83b5f71 100644 --- a/escheduler-ui/src/view/common/meta.inc +++ b/escheduler-ui/src/view/common/meta.inc @@ -11,12 +11,12 @@ - - - + + + + diff --git a/package.xml b/package.xml index 4976f061fd..619dfb07cf 100644 --- a/package.xml +++ b/package.xml @@ -34,6 +34,14 @@ . + + escheduler-ui/dist + + **/*.* + + ./ui + + sql From dd3231c7095b707c3812ba36ab91248e53b0182f Mon Sep 17 00:00:00 2001 From: Baoqi Date: Tue, 16 Jul 2019 16:59:09 +0800 Subject: [PATCH 2/2] Delete MetricsController.java --- .../java/cn/escheduler/api/controller/MetricsController.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java b/escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java deleted file mode 100644 index 000120720e..0000000000 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.escheduler.api.controller; - -public class MetricsController { -}