From 668ac9017f26f99c7d015a687cccf471d2158c05 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 9 May 2016 10:01:51 +0800 Subject: [PATCH] adjust accept-count property name --- .../apollo/biz/customize/TomcatContainerCustomizer.java | 9 +++++++-- .../com/ctrip/apollo/biz/utils/EntityManagerUtil.java | 3 +++ apollo-biz/src/main/resources/application.properties | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/customize/TomcatContainerCustomizer.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/customize/TomcatContainerCustomizer.java index 8f847cd28..111a8d61d 100644 --- a/apollo-biz/src/main/java/com/ctrip/apollo/biz/customize/TomcatContainerCustomizer.java +++ b/apollo-biz/src/main/java/com/ctrip/apollo/biz/customize/TomcatContainerCustomizer.java @@ -3,6 +3,8 @@ package com.ctrip.apollo.biz.customize; import org.apache.catalina.connector.Connector; import org.apache.coyote.ProtocolHandler; import org.apache.coyote.http11.Http11NioProtocol; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer; import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; @@ -16,7 +18,8 @@ import org.springframework.stereotype.Component; */ @Component public class TomcatContainerCustomizer implements EmbeddedServletContainerCustomizer { - private static final String TOMCAT_ACCEPTOR_COUNT = "server.tomcat.acceptor-count"; + private static final Logger logger = LoggerFactory.getLogger(TomcatContainerCustomizer.class); + private static final String TOMCAT_ACCEPTOR_COUNT = "server.tomcat.accept-count"; @Autowired private Environment environment; @@ -36,7 +39,9 @@ public class TomcatContainerCustomizer implements EmbeddedServletContainerCustom ProtocolHandler handler = connector.getProtocolHandler(); if (handler instanceof Http11NioProtocol) { Http11NioProtocol http = (Http11NioProtocol) handler; - http.setBacklog(Integer.parseInt(environment.getProperty(TOMCAT_ACCEPTOR_COUNT))); + int acceptCount = Integer.parseInt(environment.getProperty(TOMCAT_ACCEPTOR_COUNT)); + http.setBacklog(acceptCount); + logger.info("Setting tomcat accept count to {}", acceptCount); } } diff --git a/apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/EntityManagerUtil.java b/apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/EntityManagerUtil.java index 72da6e26a..f0a645590 100644 --- a/apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/EntityManagerUtil.java +++ b/apollo-biz/src/main/java/com/ctrip/apollo/biz/utils/EntityManagerUtil.java @@ -1,5 +1,7 @@ package com.ctrip.apollo.biz.utils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.orm.jpa.EntityManagerFactoryAccessor; import org.springframework.orm.jpa.EntityManagerFactoryUtils; import org.springframework.orm.jpa.EntityManagerHolder; @@ -11,6 +13,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager */ @Component public class EntityManagerUtil extends EntityManagerFactoryAccessor { + private static final Logger logger = LoggerFactory.getLogger(EntityManagerUtil.class); /** * close the entity manager. * Use it with caution! This is only intended for use with async request, which Spring won't diff --git a/apollo-biz/src/main/resources/application.properties b/apollo-biz/src/main/resources/application.properties index 595425413..bb3db4a7e 100644 --- a/apollo-biz/src/main/resources/application.properties +++ b/apollo-biz/src/main/resources/application.properties @@ -9,4 +9,4 @@ spring.jpa.hibernate.globally_quoted_identifiers=true spring.jpa.properties.hibernate.globally_quoted_identifiers=true # Tomcat configuration -server.tomcat.acceptor-count=1024 +server.tomcat.accept-count=1024 -- GitLab