You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2017/08/08 01:19:27 UTC
directory-kerby git commit: DIRKRB-645 Start KerbyKdcServer should be
failed if kdc_port already in use. Contributed by Lin Zeng.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk f21c54145 -> 3c00bc97e
DIRKRB-645 Start KerbyKdcServer should be failed if kdc_port already in use. Contributed by Lin Zeng.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/3c00bc97
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/3c00bc97
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/3c00bc97
Branch: refs/heads/trunk
Commit: 3c00bc97e0c8dd16011040087f13fd65c947a70e
Parents: f21c541
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Aug 8 09:19:19 2017 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Aug 8 09:19:19 2017 +0800
----------------------------------------------------------------------
benchmark/pom.xml | 5 -----
.../org/apache/kerby/kerberos/kdc/KerbyKdcServer.java | 9 +++++++--
.../apache/kerby/kerberos/kdc/impl/NettyKdcNetwork.java | 12 +++++++-----
3 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/3c00bc97/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 09f0dec..997c348 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -73,11 +73,6 @@
<artifactId>json-backend</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>zookeeper-backend</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/3c00bc97/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
index 79cc46a..d315751 100644
--- a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
+++ b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
@@ -87,7 +87,12 @@ public class KerbyKdcServer extends KdcServer {
System.exit(4);
}
- server.start();
- System.out.println("KDC started.");
+ try {
+ server.start();
+ System.out.println("KDC started.");
+ } catch (KrbException e) {
+ System.err.println("Errors occurred when start kdc server: " + e.getMessage());
+ System.exit(5);
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/3c00bc97/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/impl/NettyKdcNetwork.java
----------------------------------------------------------------------
diff --git a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/impl/NettyKdcNetwork.java b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/impl/NettyKdcNetwork.java
index 50fbcf8..c230635 100644
--- a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/impl/NettyKdcNetwork.java
+++ b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/impl/NettyKdcNetwork.java
@@ -34,6 +34,7 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
import io.netty.handler.logging.LogLevel;
import io.netty.handler.logging.LoggingHandler;
import io.netty.util.concurrent.DefaultEventExecutorGroup;
+import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.server.KdcContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,11 +69,12 @@ public class NettyKdcNetwork {
this.udpAddress = udpAddress;
}
- public void start() {
+ public void start() throws Exception {
try {
doStart();
} catch (Exception e) {
- LOG.error("Error occurred while starting the netty kdc network.");
+ LOG.error("Error occurred while starting the netty kdc network. " + e.toString());
+ throw new KrbException("Error occurred while starting the netty kdc network. ", e);
}
}
@@ -85,19 +87,19 @@ public class NettyKdcNetwork {
.childHandler(createChannelInitializer());
// Start the server.
- b.bind(tcpAddress.getPort());
+ b.bind(tcpAddress.getPort()).sync();
if (udpAddress != null) {
startUDPServer();
}
}
- private void startUDPServer() {
+ private void startUDPServer() throws InterruptedException {
this.group = new NioEventLoopGroup();
Bootstrap b = new Bootstrap();
b.group(group).channel(NioDatagramChannel.class)
.option(ChannelOption.SO_BROADCAST, true)
.handler((ChannelHandler) new NettyKdcUdpServerHandler(kdcContext));
- b.bind(udpAddress.getPort());
+ b.bind(udpAddress.getPort()).sync();
}
static class KrbMessageDecoder extends LengthFieldBasedFrameDecoder {