Commit 1b5b1e25 authored by Baoqi's avatar Baoqi
Browse files

close 579, add combined server to simplify test

parent bd30d48c

escheduler-api/pom.xml

+5 −3
Original line number Diff line number Diff line
@@ -9,8 +9,10 @@ 
  <packaging>jar</packaging>



  <dependencies>





      <dependency>

          <groupId>cn.analysys</groupId>

          <artifactId>escheduler-alert</artifactId>

      </dependency>

      <dependency>

      <groupId>cn.analysys</groupId>

      <artifactId>escheduler-server</artifactId>

escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/*

 * 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();

    }

}

escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java

+1 −0
Original line number Diff line number Diff line
@@ -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

escheduler-api/src/main/java/cn/escheduler/api/controller/MetricsController.java

0 → 100644
+4 −0
Original line number Diff line number Diff line 
package cn.escheduler.api.controller;



public class MetricsController {

}

escheduler-api/src/main/resources/combined_logback.xml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->

<configuration scan="true" scanPeriod="120 seconds">

    <property name="log.base" value="logs"/>

    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

        <encoder>

            <pattern>

                %highlight([%level]) %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{10}:[%line] - %msg%n

            </pattern>

            <charset>UTF-8</charset>

        </encoder>

    </appender>

    <appender name="TASKLOGFILE" class="cn.escheduler.server.worker.log.TaskLogAppender">

        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">

            <level>INFO</level>

        </filter>

        <filter class="cn.escheduler.server.worker.log.TaskLogFilter"></filter>

        <file>${log.base}/{processDefinitionId}/{processInstanceId}/{taskInstanceId}.log</file>

        <encoder>

            <pattern>

                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n

            </pattern>

            <charset>UTF-8</charset>

        </encoder>

        <append>true</append>

    </appender>



    <appender name="COMBINEDLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">

        <file>${log.base}/escheduler-combined.log</file>

        <filter class="cn.escheduler.server.worker.log.WorkerLogFilter">

            <level>INFO</level>

        </filter>



        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">

            <fileNamePattern>${log.base}/escheduler-combined.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>

            <maxHistory>168</maxHistory>

            <maxFileSize>200MB</maxFileSize>

        </rollingPolicy>

             

        <encoder>

            <pattern>

                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n

            </pattern>

            <charset>UTF-8</charset>

        </encoder>

          

    </appender>





    <root level="INFO">

        <appender-ref ref="STDOUT"/>

        <appender-ref ref="TASKLOGFILE"/>

        <appender-ref ref="COMBINEDLOGFILE"/>

    </root>

</configuration>
 
 No newline at end of file