Skip to content

M
matrix
Commit 6b39172b by 房斌
Options

4 hook shutdown 错别字

parent 5b62b80b
Showing with 45 additions and 45 deletions
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/GracefullyShoutDown.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/GracefulShutDown.java
......@@ -8,7 +8,7 @@ import com.secoo.mall.common.util.log.LoggerUtil;
import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetail;
import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetails;
import com.secoo.mall.dubbo.monitor.dubbo.service.RegistryServerSync;
import com.secoo.mall.dubbo.service.impl.TomcatConnectShoutDownHock;
import com.secoo.mall.dubbo.service.impl.TomcatShutDownHock;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.config.DubboShutdownHook;
import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
......@@ -29,9 +29,9 @@ import java.util.*;
import static org.springframework.context.support.AbstractApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME;
public class GracefullyShoutDown implements CommandLineRunner, ApplicationListener<ContextClosedEvent>,ApplicationContextAware , Ordered {
public class GracefulShutDown implements CommandLineRunner, ApplicationListener<ContextClosedEvent>,ApplicationContextAware , Ordered {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
// TomcatConnectShoutDownHock tomcatConnectShoutDownHock;
// TomcatShutDownHock tomcatShutDownHock;
private ApplicationContext context;
// private ProviderService providerService ;
......@@ -39,13 +39,13 @@ public class GracefullyShoutDown implements CommandLineRunner, ApplicationListen
UpDatas dubboUpdata;
// public GracefullyShoutDown(TomcatConnectShoutDownHock tomcatConnectShoutDownHock,ProviderService providerService,UpDatas dubboUpdata){
// this.tomcatConnectShoutDownHock=tomcatConnectShoutDownHock;
// public GracefulShutDown(TomcatShutDownHock tomcatShutDownHock,ProviderService providerService,UpDatas dubboUpdata){
// this.tomcatShutDownHock=tomcatShutDownHock;
// this.providerService=providerService;
// this.dubboUpdata=dubboUpdata;
// }
public GracefullyShoutDown(UpDatas dubboUpdata) {
public GracefulShutDown(UpDatas dubboUpdata) {
this.dubboUpdata = dubboUpdata;
}
......@@ -80,7 +80,7 @@ public class GracefullyShoutDown implements CommandLineRunner, ApplicationListen
if (map != null && map.size() > 0) {
Set<StopService> ts = new TreeSet<StopService>();
for (StopService service : map.values()) {
if (!(service instanceof TomcatConnectShoutDownHock)) {
if (!(service instanceof TomcatShutDownHock)) {
ts.add(service);
}
}
......@@ -100,7 +100,7 @@ public class GracefullyShoutDown implements CommandLineRunner, ApplicationListen
try {
dubboUpdata.upData(result);
} catch (Exception e) {
LoggerUtil.error("matrix.GracefullyShoutDown update .error data:" + JSON.toJSONString(result), e);
LoggerUtil.error("matrix.GracefulShutDown update .error data:" + JSON.toJSONString(result), e);
}
......@@ -131,7 +131,7 @@ public class GracefullyShoutDown implements CommandLineRunner, ApplicationListen
String name = ApplicationModel.getApplication();
result.setIp(ip);
result.setName(name);
logger.info("GracefullyShoutDown execute:name:"+name+" ip:"+ip+" time:"+ DateUtil.getDateTime());
logger.info("GracefulShutDown execute:name:"+name+" ip:"+ip+" time:"+ DateUtil.getDateTime());
try {
......@@ -139,7 +139,7 @@ public class GracefullyShoutDown implements CommandLineRunner, ApplicationListen
if (map != null && map.size() > 0) {
Set<StopService> ts = new TreeSet<StopService>();
for (StopService service : map.values()) {
if(!(service instanceof TomcatGracefullyShutDown)) {
if(!(service instanceof TomcatGracefulShutDownEntrance)) {
ts.add(service);
}
}
......@@ -158,14 +158,14 @@ public class GracefullyShoutDown implements CommandLineRunner, ApplicationListen
}
} catch (Exception e) {
LoggerUtil.error("matrix.GracefullyShoutDown.error", e);
LoggerUtil.error("matrix.GracefulShutDown.error", e);
}
try {
dubboUpdata.upData(result);
} catch (Exception e) {
LoggerUtil.error("matrix.GracefullyShoutDown update .error data:" + JSON.toJSONString(result), e);
LoggerUtil.error("matrix.GracefulShutDown update .error data:" + JSON.toJSONString(result), e);
}
logger.info("GracefullyShoutDown execute end :name:"+name+" ip:"+ip+" time:"+ DateUtil.getDateTime());
logger.info("GracefulShutDown execute end :name:"+name+" ip:"+ip+" time:"+ DateUtil.getDateTime());
}
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/TomcatGracefullyShutDown.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/TomcatGracefulShutDownEntrance.java
package com.secoo.mall.dubbo.service;
import com.secoo.mall.dubbo.service.impl.TomcatConnectShoutDownHock;
import com.secoo.mall.dubbo.service.impl.TomcatShutDownHock;
import org.apache.catalina.connector.Connector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -12,22 +12,22 @@ import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextClosedEvent;
import org.springframework.core.Ordered;
public class TomcatGracefullyShutDown implements TomcatConnectorCustomizer , ApplicationContextAware, Ordered , ApplicationListener<ContextClosedEvent> {
public class TomcatGracefulShutDownEntrance implements TomcatConnectorCustomizer , ApplicationContextAware, Ordered , ApplicationListener<ContextClosedEvent> {
private ApplicationContext context;
TomcatConnectShoutDownHock tomcatConnectShoutDownHock;
TomcatShutDownHock tomcatShutDownHock;
private final Logger logger = LoggerFactory.getLogger(this.getClass());
public TomcatGracefullyShutDown(TomcatConnectShoutDownHock tomcatConnectShoutDownHock) {
this.tomcatConnectShoutDownHock = tomcatConnectShoutDownHock;
public TomcatGracefulShutDownEntrance(TomcatShutDownHock tomcatShutDownHock) {
this.tomcatShutDownHock = tomcatShutDownHock;
}
@Override
public void customize(Connector connector) {
tomcatConnectShoutDownHock.setConnector(connector);
tomcatShutDownHock.setConnector(connector);
}
......@@ -36,12 +36,12 @@ public class TomcatGracefullyShutDown implements TomcatConnectorCustomizer , App
this.context = applicationContext;
logger.info("11111111111111111111 setContext");
}
public TomcatConnectShoutDownHock getTomcatConnectShoutDownHock() {
return tomcatConnectShoutDownHock;
public TomcatShutDownHock getTomcatShutDownHock() {
return tomcatShutDownHock;
}
public void setTomcatConnectShoutDownHock(TomcatConnectShoutDownHock tomcatConnectShoutDownHock) {
this.tomcatConnectShoutDownHock = tomcatConnectShoutDownHock;
public void setTomcatShutDownHock(TomcatShutDownHock tomcatShutDownHock) {
this.tomcatShutDownHock = tomcatShutDownHock;
}
@Override
......@@ -52,6 +52,6 @@ public class TomcatGracefullyShutDown implements TomcatConnectorCustomizer , App
@Override
public void onApplicationEvent(ContextClosedEvent contextClosedEvent) {
logger.info("11111111111111111111 ");
tomcatConnectShoutDownHock.stop();
tomcatShutDownHock.stop();
}
}
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/impl/DubboCustomerDownHock.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/impl/DubboCustomerShutDownHock.java
......@@ -28,7 +28,7 @@ import java.util.*;
import java.util.concurrent.*;
public class DubboCustomerDownHock extends AbstractStop implements Observer {
public class DubboCustomerShutDownHock extends AbstractStop implements Observer {
private ProviderService providerService;
RegistryServerSync registryServerSync;
......@@ -41,7 +41,7 @@ public class DubboCustomerDownHock extends AbstractStop implements Observer {
this.registryServerSync = registryServerSync;
}
public DubboCustomerDownHock(ProviderService providerService) {
public DubboCustomerShutDownHock(ProviderService providerService) {
this.providerService = providerService;
}
......@@ -73,10 +73,10 @@ public class DubboCustomerDownHock extends AbstractStop implements Observer {
while (iterator.hasNext()) {
Registry r = iterator.next();
zookperRegster = (ZookeeperRegistry) r;
str.add(" DubboCustomerDownHock zookperRegstered-------------->"+zookperRegster.getRegistered().toString()+StringUtil.line());
str.add(" DubboCustomerShutDownHock zookperRegstered-------------->"+zookperRegster.getRegistered().toString()+StringUtil.line());
if (zookperRegster.getRegistered() != null && zookperRegster.getRegistered().size() > 0) {
urls = zookperRegster.getRegistered();
str.add(" DubboCustomerDownHock zookperRegstered urls-------------->"+((urls!=null&&urls.size()>0)?JSON.toJSONString(urls):"url si null")+StringUtil.line());
str.add(" DubboCustomerShutDownHock zookperRegstered urls-------------->"+((urls!=null&&urls.size()>0)?JSON.toJSONString(urls):"url si null")+StringUtil.line());
if (urls != null && urls.size() > 0) {
checks=new ArrayList<URL>();
for (URL value : urls) {
......@@ -135,7 +135,7 @@ public class DubboCustomerDownHock extends AbstractStop implements Observer {
DubboShutdownHook.getDubboShutdownHook().doDestroy();
}
detail.setEndTime(DateUtil.getDateTime());
logger.info("GracefullyShoutDown dubbo end execute:name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
logger.info("GracefulShutDown dubbo end execute:name:" + name + " ip:" + ip + " time:" + DateUtil.getDateTime());
return detail;
}
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/impl/TomcatConnectShoutDownHock.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/service/impl/TomcatShutDownHock.java
......@@ -12,7 +12,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
//springboot 容器关闭
public class TomcatConnectShoutDownHock extends AbstractStop {
public class TomcatShutDownHock extends AbstractStop {
private volatile Connector connector;
public Connector getConnector() {
......
matrix-gracefulshutdown/src/main/java/com/secoo/mall/dubbo/spring/boot/autoconfigure/MatrixGracefulShutDownAutoConfiguration.java
......@@ -6,11 +6,11 @@ import com.secoo.mall.dubbo.monitor.config.ConfigCenter;
import com.secoo.mall.dubbo.monitor.dubbo.service.ProviderService;
import com.secoo.mall.dubbo.monitor.dubbo.service.RegistryServerSync;
import com.secoo.mall.dubbo.monitor.dubbo.service.impl.ProviderServiceImpl;
import com.secoo.mall.dubbo.service.GracefullyShoutDown;
import com.secoo.mall.dubbo.service.TomcatGracefullyShutDown;
import com.secoo.mall.dubbo.service.impl.DubboCustomerDownHock;
import com.secoo.mall.dubbo.service.GracefulShutDown;
import com.secoo.mall.dubbo.service.TomcatGracefulShutDownEntrance;
import com.secoo.mall.dubbo.service.impl.DubboCustomerShutDownHock;
import com.secoo.mall.dubbo.service.DubboUpdata;
import com.secoo.mall.dubbo.service.impl.TomcatConnectShoutDownHock;
import com.secoo.mall.dubbo.service.impl.TomcatShutDownHock;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.registry.Registry;
......@@ -51,8 +51,8 @@ public class MatrixGracefulShutDownAutoConfiguration {
@Bean
@ConditionalOnClass({ProviderService.class,RegistryServerSync.class})
@ConditionalOnExpression("!T(org.springframework.util.StringUtils).isEmpty('${dubbo.registry.address:}')")
DubboCustomerDownHock createDubboConsumerDownHock(ProviderService providerService, RegistryServerSync registryServerSync) {
DubboCustomerDownHock hock= new DubboCustomerDownHock(providerService);
DubboCustomerShutDownHock createDubboConsumerDownHock(ProviderService providerService, RegistryServerSync registryServerSync) {
DubboCustomerShutDownHock hock= new DubboCustomerShutDownHock(providerService);
registryServerSync.addObserver(hock);
hock.setRegistryServerSync(registryServerSync);
return hock;
......@@ -77,25 +77,25 @@ public class MatrixGracefulShutDownAutoConfiguration {
@Bean
@ConditionalOnClass(TomcatConnectorCustomizer.class)
TomcatConnectShoutDownHock createServletConnectShoutDownHock() {
return new TomcatConnectShoutDownHock();
TomcatShutDownHock createServletConnectShoutDownHock() {
return new TomcatShutDownHock();
}
@Bean
@ConditionalOnClass(TomcatConnectShoutDownHock.class)
public TomcatGracefullyShutDown createSpringbootTomcatInit(TomcatConnectShoutDownHock tomcatConnectShoutDownHock){
return new TomcatGracefullyShutDown(tomcatConnectShoutDownHock);
@ConditionalOnClass(TomcatShutDownHock.class)
public TomcatGracefulShutDownEntrance createSpringbootTomcatInit(TomcatShutDownHock tomcatShutDownHock){
return new TomcatGracefulShutDownEntrance(tomcatShutDownHock);
}
// @Bean
// public GracefullyShoutDown createGraceObject(TomcatConnectShoutDownHock servletConnectShoutDownHock, ProviderService providerService, UpDatas dubboUpdata) {
// return new GracefullyShoutDown( servletConnectShoutDownHock, providerService, dubboUpdata);
// public GracefulShutDown createGraceObject(TomcatShutDownHock servletConnectShoutDownHock, ProviderService providerService, UpDatas dubboUpdata) {
// return new GracefulShutDown( servletConnectShoutDownHock, providerService, dubboUpdata);
// }
@Bean
@ConditionalOnExpression("!T(org.springframework.util.StringUtils).isEmpty('${dubbo.registry.address:}')")
public GracefullyShoutDown createGraceObject( UpDatas dubboUpdata) {
return new GracefullyShoutDown(dubboUpdata);
public GracefulShutDown createGraceObject(UpDatas dubboUpdata) {
return new GracefulShutDown(dubboUpdata);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment