Skip to content

Commit 708aa48

Browse files
jlangchjlangch
committed
Improved TcpServer logging
1 parent 93655b2 commit 708aa48

File tree

5 files changed

+35
-23
lines changed

5 files changed

+35
-23
lines changed

‎src/main/java/com/github/jlangch/venice/impl/functions/IPCFunctions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,11 @@ public VncVal apply(final VncList args) {
241241
final TcpServer server = new TcpServer(port);
242242

243243
if (maxConn > 0) {
244-
server.setMaximumParallelConnections(maxConn);
244+
server.setMaxParallelConnections(maxConn);
245245
}
246246

247247
if (maxMsgSize > 0) {
248-
server.setMaximumMessageSize(maxMsgSize);
248+
server.setMaxMessageSize(maxMsgSize);
249249
}
250250

251251
if (maxQueues > 0) {

‎src/main/java/com/github/jlangch/venice/util/ipc/TcpServer.java‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public TcpServer(final int port, final int timeout) {
9292
* @param count the max parallel connection count
9393
* @return this server
9494
*/
95-
public TcpServer setMaximumParallelConnections(final int count) {
95+
public TcpServer setMaxParallelConnections(final int count) {
9696
mngdExecutor.setMaximumThreadPoolSize(Math.max(1, count));
9797
return this;
9898
}
@@ -157,15 +157,15 @@ public long getCompressCutoffSize() {
157157
* @param maxSize the max message size in bytes
158158
* @return this server
159159
*/
160-
public TcpServer setMaximumMessageSize(final long maxSize) {
160+
public TcpServer setMaxMessageSize(final long maxSize) {
161161
maxMessageSize.set(Math.max(MESSAGE_LIMIT_MIN, Math.min(MESSAGE_LIMIT_MAX, maxSize)));
162162
return this;
163163
}
164164

165165
/**
166166
* @return return the server's max message size
167167
*/
168-
public long getMaximumMessageSize() {
168+
public long getMaxMessageSize() {
169169
return maxMessageSize.get();
170170
}
171171

@@ -239,6 +239,7 @@ public void enableLogger(final File logDir) {
239239
}
240240

241241
logger.enable(logDir);
242+
242243
}
243244

244245
/**
@@ -308,6 +309,14 @@ public void start(final Function<IMessage,IMessage> handler) {
308309
ch.configureBlocking(true);
309310

310311
logger.info("server", "Server started on port " + port);
312+
logger.info("server", "Socket Timeout: " + timeout);
313+
logger.info("server", "Encryption: " + isEncrypted());
314+
logger.info("server", "Max Queues: " + getMaxQueues());
315+
logger.info("server", "Max Msg Size: " + getMaxMessageSize());
316+
logger.info("server", "Compress Cutoff Size: " + getCompressCutoffSize());
317+
logger.info("server", "Log-File: " + logger.getLogFile());
318+
logger.info("server", "Write-Ahead-Log: " + isWriteAheadLog());
319+
logger.info("server", "Write-Ahead-Log-Dir: " + wal.getWalDir());
311320

312321
if (wal.isEnabled()) {
313322
// Preload the queues from the Write-Ahead-Log
@@ -362,18 +371,19 @@ public void start(final Function<IMessage,IMessage> handler) {
362371
});
363372
}
364373
catch(Exception ex) {
365-
final String msg = "Closed TcpServer @ 127.0.0.1 on port " + port + "!";
374+
final String msg = "Closed server on port " + port + "!";
366375
logger.error("server", msg, ex);
376+
367377
safeClose(ch);
368378
started.set(false);
369379
server.set(null);
370380
throw new VncException(msg, ex);
371381
}
372382
}
373383
else {
374-
final String msg = "The TcpServer @ 127.0.0.1 on port " + port
375-
+ " has already been started!";
384+
final String msg = "The server on port " + port + " has already been started!";
376385
logger.error("server", msg);
386+
377387
throw new VncException(msg);
378388
}
379389
}
@@ -525,20 +535,22 @@ private ServerSocketChannel startServer() {
525535
return srv;
526536
}
527537
catch(BindException ex) {
538+
final String msg = "Already running! Failed to start server on port " + port + "!";
539+
logger.error("server", msg, ex);
540+
528541
safeClose(srv);
529542
started.set(false);
530543
server.set(null);
531-
throw new VncException(
532-
"Failed to start TcpServer @ 127.0.0.1 on port " + port + "! " + ex.getMessage(),
533-
ex);
544+
throw new VncException(msg, ex);
534545
}
535546
catch(Exception ex) {
547+
final String msg = "Failed to start server on port " + port + "!";
548+
logger.error("server", msg, ex);
549+
536550
safeClose(srv);
537551
started.set(false);
538552
server.set(null);
539-
throw new VncException(
540-
"Failed to start TcpServer @ 127.0.0.1 on port " + port + "!",
541-
ex);
553+
throw new VncException(msg, ex);
542554
}
543555
}
544556

‎src/test/java/com/github/jlangch/venice/util/ipc/TcpRequestResponseEncryptedTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public void test_echo_server_multiple_clients() throws Exception {
261261
final TcpServer server = new TcpServer(33333);
262262

263263
// increase connections to support the test client count
264-
server.setMaximumParallelConnections(50);
264+
server.setMaxParallelConnections(50);
265265

266266
final int clients = 30;
267267
final int messagesPerClient = 25;

‎src/test/java/com/github/jlangch/venice/util/ipc/TcpRequestResponseTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public void test_echo_server_multiple_clients() throws Exception {
279279
final TcpServer server = new TcpServer(33333);
280280

281281
// increase connections to support the test client count
282-
server.setMaximumParallelConnections(50);
282+
server.setMaxParallelConnections(50);
283283

284284
final int clients = 30;
285285
final int messagesPerClient = 25;

‎src/test/java/com/github/jlangch/venice/util/ipc/TcpServerTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -234,19 +234,19 @@ public void test_server_threadpool_stats() throws Exception {
234234
@Test
235235
public void test_server_max_size() throws Exception {
236236
try (TcpServer server = new TcpServer(33333)) {
237-
assertEquals(TcpServer.MESSAGE_LIMIT_MAX, server.getMaximumMessageSize());
237+
assertEquals(TcpServer.MESSAGE_LIMIT_MAX, server.getMaxMessageSize());
238238

239239
// below minimum
240-
server.setMaximumMessageSize(100L);
241-
assertEquals(TcpServer.MESSAGE_LIMIT_MIN, server.getMaximumMessageSize());
240+
server.setMaxMessageSize(100L);
241+
assertEquals(TcpServer.MESSAGE_LIMIT_MIN, server.getMaxMessageSize());
242242

243243
// in range
244-
server.setMaximumMessageSize(100L * 1024L);
245-
assertEquals(100L * 1024L, server.getMaximumMessageSize());
244+
server.setMaxMessageSize(100L * 1024L);
245+
assertEquals(100L * 1024L, server.getMaxMessageSize());
246246

247247
// above maximum
248-
server.setMaximumMessageSize(800L * 1024L * 1024L);
249-
assertEquals(TcpServer.MESSAGE_LIMIT_MAX, server.getMaximumMessageSize());
248+
server.setMaxMessageSize(800L * 1024L * 1024L);
249+
assertEquals(TcpServer.MESSAGE_LIMIT_MAX, server.getMaxMessageSize());
250250
}
251251
}
252252

0 commit comments

Comments
 (0)