Commit f2795a1b authored by Liang Ding's avatar Liang Ding

支持 Unix domain socket Fix #127

parent 342de1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: Solo POM. Description: Solo POM.
Version: 3.18.3.95, May 19, 2020 Version: 3.18.3.96, May 21, 2020
Author: <a href="http://88250.b3log.org">Liang Ding</a> Author: <a href="http://88250.b3log.org">Liang Ding</a>
Author: <a href="http://www.annpeter.cn">Ann Peter</a> Author: <a href="http://www.annpeter.cn">Ann Peter</a>
Author: <a href="http://vanessa.b3log.org">Vanessa</a> Author: <a href="http://vanessa.b3log.org">Vanessa</a>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</scm> </scm>
<properties> <properties>
<org.b3log.latke.version>3.4.1</org.b3log.latke.version> <org.b3log.latke.version>3.4.2</org.b3log.latke.version>
<jsoup.version>1.12.1</jsoup.version> <jsoup.version>1.12.1</jsoup.version>
<flexmark.version>0.50.40</flexmark.version> <flexmark.version>0.50.40</flexmark.version>
......
...@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* Server. * Server.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 3.0.1.6, May 19, 2020 * @version 3.0.1.7, May 21, 2020
* @since 1.2.0 * @since 1.2.0
*/ */
public final class Server extends BaseServer { public final class Server extends BaseServer {
...@@ -110,6 +110,9 @@ public final class Server extends BaseServer { ...@@ -110,6 +110,9 @@ public final class Server extends BaseServer {
final Option listenPortOpt = Option.builder().longOpt("listen_port").argName("LISTEN_PORT").hasArg().desc("listen port, default is 8080").build(); final Option listenPortOpt = Option.builder().longOpt("listen_port").argName("LISTEN_PORT").hasArg().desc("listen port, default is 8080").build();
options.addOption(listenPortOpt); options.addOption(listenPortOpt);
final Option unixDomainSocketPathOpt = Option.builder("udsp").longOpt("unix_domain_socket_path").argName("UNIX_DOMAIN_SOCKET_PATH").hasArg().desc("unix domain socket path").build();
options.addOption(unixDomainSocketPathOpt);
final Option serverSchemeOpt = Option.builder().longOpt("server_scheme").argName("SERVER_SCHEME").hasArg().desc("browser visit protocol, default is http").build(); final Option serverSchemeOpt = Option.builder().longOpt("server_scheme").argName("SERVER_SCHEME").hasArg().desc("browser visit protocol, default is http").build();
options.addOption(serverSchemeOpt); options.addOption(serverSchemeOpt);
...@@ -161,11 +164,6 @@ public final class Server extends BaseServer { ...@@ -161,11 +164,6 @@ public final class Server extends BaseServer {
return; return;
} }
String portArg = commandLine.getOptionValue("listen_port");
if (!Strings.isNumeric(portArg)) {
portArg = "8080";
}
try { try {
Latkes.setScanPath("org.b3log.solo"); Latkes.setScanPath("org.b3log.solo");
Latkes.init(); Latkes.init();
...@@ -313,7 +311,16 @@ public final class Server extends BaseServer { ...@@ -313,7 +311,16 @@ public final class Server extends BaseServer {
LOGGER.log(Level.DEBUG, "Stopwatch: {}{}", Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat()); LOGGER.log(Level.DEBUG, "Stopwatch: {}{}", Strings.LINE_SEPARATOR, Stopwatchs.getTimingStat());
Stopwatchs.release(); Stopwatchs.release();
server.start(Integer.parseInt(portArg)); final String unixDomainSocketPath = commandLine.getOptionValue("unix_domain_socket_path");
if (StringUtils.isNotBlank(unixDomainSocketPath)) {
server.start(unixDomainSocketPath);
} else {
String portArg = commandLine.getOptionValue("listen_port");
if (!Strings.isNumeric(portArg)) {
portArg = "8080";
}
server.start(Integer.parseInt(portArg));
}
} }
/** /**
......
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