mirror of
https://github.com/ctripcorp/zeus.git
synced 2024-09-22 00:26:05 +08:00
add error page enable config
This commit is contained in:
parent
390b3cf8c7
commit
386cd055f0
|
@ -6,6 +6,7 @@ import com.ctrip.zeus.model.entity.Slb;
|
|||
import com.ctrip.zeus.model.entity.VirtualServer;
|
||||
import com.ctrip.zeus.service.model.PathRewriteParser;
|
||||
import com.ctrip.zeus.util.AssertUtils;
|
||||
import com.netflix.config.DynamicBooleanProperty;
|
||||
import com.netflix.config.DynamicPropertyFactory;
|
||||
import com.netflix.config.DynamicStringProperty;
|
||||
|
||||
|
@ -22,6 +23,9 @@ public class LocationConf {
|
|||
private static DynamicStringProperty xforwardedforWhileList = DynamicPropertyFactory.getInstance().getStringProperty("x-forwarded-for.white.list", "172\\..*|192\\.168.*|10\\..*");
|
||||
private static DynamicStringProperty errorPageWhileList = DynamicPropertyFactory.getInstance().getStringProperty("errorPage.white.list", null);
|
||||
private static DynamicStringProperty proxyTimeoutList = DynamicPropertyFactory.getInstance().getStringProperty("proxy.read-timeout.list", null);
|
||||
private static DynamicStringProperty errorPage_404 = DynamicPropertyFactory.getInstance().getStringProperty("errorPage.404.url", null);//"http://slberrorpages.ctripcorp.com/slberrorpages/404.htm");
|
||||
private static DynamicStringProperty errorPage_500 = DynamicPropertyFactory.getInstance().getStringProperty("errorPage.500.url", null);//"http://slberrorpages.ctripcorp.com/slberrorpages/500.htm");
|
||||
private static DynamicBooleanProperty errorPageEnable = DynamicPropertyFactory.getInstance().getBooleanProperty("errorPage.enable", false);//"http://slberrorpages.ctripcorp.com/slberrorpages/500.htm");
|
||||
|
||||
public static String generate(Slb slb, VirtualServer vs, Group group, String upstreamName)throws Exception {
|
||||
StringBuilder b = new StringBuilder(1024);
|
||||
|
@ -167,6 +171,9 @@ public class LocationConf {
|
|||
.append("add_header Bastion $cookie_bastion;\n}\n");
|
||||
}
|
||||
private static void addErrorPageConfig(StringBuilder sb,Long groupId){
|
||||
if (!errorPageEnable.get()||errorPage_404.get()==null || errorPage_500.get() == null){
|
||||
return;
|
||||
}
|
||||
String list = errorPageWhileList.get();
|
||||
if (list == null){
|
||||
return;
|
||||
|
|
|
@ -7,6 +7,7 @@ import com.ctrip.zeus.model.entity.Slb;
|
|||
import com.ctrip.zeus.model.entity.VirtualServer;
|
||||
import com.ctrip.zeus.util.AssertUtils;
|
||||
import com.ctrip.zeus.util.StringFormat;
|
||||
import com.netflix.config.DynamicBooleanProperty;
|
||||
import com.netflix.config.DynamicPropertyFactory;
|
||||
import com.netflix.config.DynamicStringProperty;
|
||||
import org.slf4j.Logger;
|
||||
|
@ -21,8 +22,9 @@ import java.util.List;
|
|||
public class ServerConf {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(ServerConf.class);
|
||||
private static DynamicStringProperty allowSSL = DynamicPropertyFactory.getInstance().getStringProperty("virtual-server-id.ssl", "");
|
||||
private static DynamicStringProperty errorPage_404 = DynamicPropertyFactory.getInstance().getStringProperty("errorPage.404.url", "http://slberrorpages.ctripcorp.com/slberrorpages/404.htm");
|
||||
private static DynamicStringProperty errorPage_500 = DynamicPropertyFactory.getInstance().getStringProperty("errorPage.500.url", "http://slberrorpages.ctripcorp.com/slberrorpages/500.htm");
|
||||
private static DynamicStringProperty errorPage_404 = DynamicPropertyFactory.getInstance().getStringProperty("errorPage.404.url", null);//"http://slberrorpages.ctripcorp.com/slberrorpages/404.htm");
|
||||
private static DynamicStringProperty errorPage_500 = DynamicPropertyFactory.getInstance().getStringProperty("errorPage.500.url", null);//"http://slberrorpages.ctripcorp.com/slberrorpages/500.htm");
|
||||
private static DynamicBooleanProperty errorPageEnable = DynamicPropertyFactory.getInstance().getBooleanProperty("errorPage.enable", false);//"http://slberrorpages.ctripcorp.com/slberrorpages/500.htm");
|
||||
public static final String SSL_PATH = "/data/nginx/ssl/";
|
||||
|
||||
public static String generate(Slb slb, VirtualServer vs, List<Group> groups) throws Exception{
|
||||
|
@ -75,6 +77,9 @@ public class ServerConf {
|
|||
return res;
|
||||
}
|
||||
private static void addErrorPage(StringBuilder sb){
|
||||
if (!errorPageEnable.get()||errorPage_404.get()==null || errorPage_500.get() == null){
|
||||
return;
|
||||
}
|
||||
sb.append("error_page 400 404 = /404page;\n");
|
||||
sb.append("error_page 500 = /500page;\n");
|
||||
sb.append("location /404page {\n");
|
||||
|
|
Loading…
Reference in a new issue