diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-12-16 08:29:14 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-12-16 08:29:14 +0000 |
commit | d3e60400a37aae23002dcdc6bc99c09d5cd27dba (patch) | |
tree | 34e2ffa43ef127d48ca9debfb28f4459f2d68f2c /messagebus | |
parent | 06964c7d6bda6f93894fa87253c705f836759421 (diff) |
improve testserver start/stop logging slightly
Diffstat (limited to 'messagebus')
-rw-r--r-- | messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java | 15 | ||||
-rw-r--r-- | messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java | 6 |
2 files changed, 16 insertions, 5 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java index 2b157a8738b..8b51599d15c 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java @@ -59,6 +59,14 @@ public class TestServer { } /** Creates a new test server. */ + public TestServer(MessageBusParams mbusParams, Slobrok slobrok) { + this(mbusParams, + new RPCNetworkParams() + .setSlobrokConfigId(getSlobrokConfig(slobrok))); + log.log(Level.INFO, "Running testServer <unnamed> at "+net.getConnectionSpec()+", location broker at "+slobrok.port()); + } + + /** Creates a new test server. */ public TestServer(MessageBusParams mbusParams, RPCNetworkParams netParams) { net = new VersionedRPCNetwork(netParams); mb = new MessageBus(net, mbusParams); @@ -68,6 +76,7 @@ public class TestServer { public TestServer(MessageBusParams mbusParams) { mb = new MessageBus(new LocalNetwork(), mbusParams); net = null; + log.log(Level.INFO, "Running testServer without network"); } /** @@ -77,8 +86,12 @@ public class TestServer { * @return true if content existed and was destroyed */ public boolean destroy() { - log.log(Level.INFO, "Destroy testServer '"+net.getIdentity().getServicePrefix()+"' at "+net.getConnectionSpec()); if (!destroyed.getAndSet(true)) { + if (net != null) { + log.log(Level.INFO, "Destroy testServer '"+net.getIdentity().getServicePrefix()+"' at "+net.getConnectionSpec()); + } else { + log.log(Level.INFO, "Destroy testServer without network"); + } mb.destroy(); if (net != null) net.destroy(); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java index aec99306ff2..f2c5b26c685 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java @@ -53,15 +53,13 @@ public class RoutingTestCase { @Before public void setUp() throws ListenFailedException, UnknownHostException { slobrok = new Slobrok(); - dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), - new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId( - TestServer.getSlobrokConfig(slobrok))); + dstServer = new TestServer("dst", null, slobrok, null); dstSession = dstServer.mb.createDestinationSession( new DestinationSessionParams().setName("session").setMessageHandler(new Receptor())); retryPolicy = new RetryTransientErrorsPolicy(); retryPolicy.setBaseDelay(0); srcServer = new TestServer(new MessageBusParams().setRetryPolicy(retryPolicy).addProtocol(new SimpleProtocol()), - new RPCNetworkParams().setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); + slobrok); srcSession = srcServer.mb.createSourceSession( new SourceSessionParams().setTimeout(600.0).setThrottlePolicy(null).setReplyHandler(new Receptor())); assertTrue(srcServer.waitSlobrok("dst/session", 1)); |