Skip to content

Commit 8904163

Browse files
author
Henning Schmiedehausen
committed
remove all system.out.println code
1 parent af42ba1 commit 8904163

22 files changed

+105
-71
lines changed

‎src/main/java/org/productivity/java/syslog4j/Syslog.java

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,7 @@ public final class Syslog
5454
* well as UNIX_SYSLOG and UNIX_SOCKET (if running on a Unix-based system).
5555
*/
5656
static {
57-
createInstance(UDP,new UDPNetSyslogConfig());
58-
createInstance(TCP,new TCPNetSyslogConfig());
59-
60-
if (OSDetectUtility.isUnix() && SyslogUtility.isClassExists(JNA_NATIVE_CLASS)) {
61-
createInstance(UNIX_SYSLOG,new UnixSyslogConfig());
62-
createInstance(UNIX_SOCKET,new UnixSocketSyslogConfig());
63-
}
57+
initialize();
6458
}
6559

6660
/**
@@ -256,6 +250,24 @@ public synchronized static final void shutdown() {
256250
}
257251
}
258252

253+
private synchronized static final void initialize() {
254+
createInstance(UDP,new UDPNetSyslogConfig());
255+
createInstance(TCP,new TCPNetSyslogConfig());
256+
257+
if (OSDetectUtility.isUnix() && SyslogUtility.isClassExists(JNA_NATIVE_CLASS)) {
258+
createInstance(UNIX_SYSLOG,new UnixSyslogConfig());
259+
createInstance(UNIX_SOCKET,new UnixSocketSyslogConfig());
260+
}
261+
}
262+
263+
synchronized static final void reset() throws InterruptedException
264+
{
265+
shutdown();
266+
Thread.sleep(200L);
267+
initialize();
268+
}
269+
270+
259271
/**
260272
* destroyInstance() gracefully shuts down the specified Syslog protocol and
261273
* removes the instance from Syslog4j.

‎src/test/java/org/productivity/java/syslog4j/test/log4j/base/AbstractLog4jSyslog4jTest.java renamed to ‎src/test/java/org/productivity/java/syslog4j/AbstractLog4jSyslog4jTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.productivity.java.syslog4j.test.log4j.base;
1+
package org.productivity.java.syslog4j;
22

33
import java.net.SocketAddress;
44
import java.util.Collections;
@@ -18,6 +18,9 @@
1818
import com.google.common.collect.Lists;
1919

2020
public abstract class AbstractLog4jSyslog4jTest extends AbstractBaseTest {
21+
22+
protected static final Logger LOG = Logger.getLogger("test");
23+
2124
protected class RecorderHandler implements SyslogServerSessionEventHandlerIF {
2225
protected List<String> recordedEvents = Lists.newArrayList();
2326

@@ -114,8 +117,8 @@ protected void verifySendReceive(List<String> events, boolean sort) {
114117
String recordedEvent = (String) recordedEvents.get(i);
115118

116119
if (!sentEvent.equals(recordedEvent)) {
117-
System.out.println("SENT: " + sentEvent);
118-
System.out.println("RCVD: " + recordedEvent);
120+
LOG.info("SENT: " + sentEvent);
121+
LOG.info("RCVD: " + recordedEvent);
119122

120123
fail("Sent and recorded events do not match");
121124
}
@@ -139,10 +142,8 @@ public void _testSendReceive(){
139142
verifySendReceive(events,true);
140143
}
141144

142-
public void tearDown() {
143-
Syslog.shutdown();
144-
145-
SyslogUtility.sleep(100);
145+
public void tearDown() throws InterruptedException {
146+
Syslog.reset();
146147

147148
SyslogServer.shutdown();
148149

‎src/test/java/org/productivity/java/syslog4j/test/net/base/AbstractNetSyslog4jTest.java renamed to ‎src/test/java/org/productivity/java/syslog4j/AbstractNetSyslog4jTest.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.productivity.java.syslog4j.test.net.base;
1+
package org.productivity.java.syslog4j;
22

33
import java.net.SocketAddress;
44
import java.util.Collections;
@@ -188,7 +188,7 @@ protected void verifySendReceive(List<String> events, boolean sortEvents, boolea
188188
String detail = "Count: " + perc + "% " + recordedEventCount + "/" + eventCount + " : " + ClientThread.active;
189189

190190
if (eventCount > recordedEventCount) {
191-
System.out.println(detail);
191+
LOG.info(detail);
192192

193193
} else if (eventCount < recordedEventCount) {
194194
detail = "Problem - Sent Events: " + eventCount + " Recorded Events: " + recordedEventCount;
@@ -198,7 +198,7 @@ protected void verifySendReceive(List<String> events, boolean sortEvents, boolea
198198
fail(detail);
199199

200200
} else {
201-
System.out.println(detail);
201+
LOG.info(detail);
202202

203203
done = true;
204204
}
@@ -236,8 +236,8 @@ protected void verifySendReceive(List<String> events, boolean sortEvents, boolea
236236
String recordedEvent = (String) recordedEvents.get(i);
237237

238238
if (!sentEvent.equals(recordedEvent)) {
239-
System.out.println("SENT: " + sentEvent);
240-
System.out.println("RCVD: " + recordedEvent);
239+
LOG.info("SENT: " + sentEvent);
240+
LOG.info("RCVD: " + recordedEvent);
241241

242242
fail("Sent and recorded events do not match");
243243
}
@@ -406,7 +406,7 @@ public void _testThreadedSendReceive(int threads, boolean sortEvents, boolean so
406406
long startTime = System.currentTimeMillis();
407407

408408
while(haveCount < events.size()) {
409-
System.out.println("Count: " + haveCount + "/" + events.size());
409+
LOG.info("Count: " + haveCount + "/" + events.size());
410410
SyslogUtility.sleep(250);
411411

412412
haveCount = recordedEvents.size() + backLogEvents.size();
@@ -418,9 +418,9 @@ public void _testThreadedSendReceive(int threads, boolean sortEvents, boolean so
418418
}
419419
}
420420

421-
System.out.println("Sent Events: " + events.size());
422-
System.out.println("BackLog Events: " + backLogEvents.size());
423-
System.out.println("Recorded Events: " + recordedEvents.size());
421+
LOG.info("Sent Events: " + events.size());
422+
LOG.info("BackLog Events: " + backLogEvents.size());
423+
LOG.info("Recorded Events: " + recordedEvents.size());
424424

425425
if (backLogEvents.size() < 1) {
426426
fail("No backLog events received");
@@ -440,16 +440,14 @@ public void _testThreadedSendReceive(int threads, boolean sortEvents, boolean so
440440
verifySendReceive(events,sortEvents,sortRecordedEvents);
441441
}
442442

443-
public void tearDown() {
444-
System.out.print("Shutting down Syslog...");
445-
Syslog.shutdown();
446-
System.out.println("done.");
443+
public void tearDown() throws InterruptedException {
444+
Syslog.reset();
447445

448446
SyslogUtility.sleep(100);
449447

450448
System.out.print("Shutting down SyslogServer...");
451449
SyslogServer.shutdown();
452-
System.out.println("done.");
450+
LOG.info("done.");
453451

454452
SyslogUtility.sleep(100);
455453
SyslogServer.initialize();

‎src/test/java/org/productivity/java/syslog4j/test/base/AbstractBaseTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import junit.framework.TestCase;
44

5+
import org.apache.log4j.Logger;
6+
57
public abstract class AbstractBaseTest extends TestCase {
6-
//
8+
protected static final Logger LOG = Logger.getLogger("test");
79
}

‎src/test/java/org/productivity/java/syslog4j/test/log4j/Log4jSyslog4jTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.productivity.java.syslog4j.test.log4j;
22

3-
import org.productivity.java.syslog4j.test.log4j.base.AbstractLog4jSyslog4jTest;
3+
import org.productivity.java.syslog4j.AbstractLog4jSyslog4jTest;
44

55
public class Log4jSyslog4jTest extends AbstractLog4jSyslog4jTest {
66
protected int getMessageCount() {

‎src/test/java/org/productivity/java/syslog4j/test/message/UDPPCISyslogMessageTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.util.Date;
44
import java.util.List;
55

6+
import org.productivity.java.syslog4j.AbstractNetSyslog4jTest;
67
import org.productivity.java.syslog4j.SyslogIF;
78
import org.productivity.java.syslog4j.impl.message.pci.PCISyslogMessage;
8-
import org.productivity.java.syslog4j.test.net.base.AbstractNetSyslog4jTest;
99
import org.productivity.java.syslog4j.util.SyslogUtility;
1010

1111
import com.google.common.collect.Lists;

‎src/test/java/org/productivity/java/syslog4j/test/message/modifier/SyslogMessageModifierTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import javax.crypto.spec.SecretKeySpec;
88

9+
import org.productivity.java.syslog4j.AbstractNetSyslog4jTest;
910
import org.productivity.java.syslog4j.SyslogFacility;
1011
import org.productivity.java.syslog4j.SyslogIF;
1112
import org.productivity.java.syslog4j.SyslogLevel;
@@ -23,7 +24,6 @@
2324
import org.productivity.java.syslog4j.impl.message.modifier.text.PrefixSyslogMessageModifier;
2425
import org.productivity.java.syslog4j.impl.message.modifier.text.StringCaseSyslogMessageModifier;
2526
import org.productivity.java.syslog4j.impl.message.modifier.text.SuffixSyslogMessageModifier;
26-
import org.productivity.java.syslog4j.test.net.base.AbstractNetSyslog4jTest;
2727
import org.productivity.java.syslog4j.util.Base64;
2828
import org.productivity.java.syslog4j.util.SyslogUtility;
2929

‎src/test/java/org/productivity/java/syslog4j/test/message/modifier/SyslogMessageModifierVerifyTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import junit.framework.TestCase;
66

7+
import org.apache.log4j.Logger;
78
import org.productivity.java.syslog4j.Syslog;
89
import org.productivity.java.syslog4j.SyslogFacility;
910
import org.productivity.java.syslog4j.SyslogIF;
@@ -22,6 +23,8 @@
2223
import org.productivity.java.syslog4j.util.Base64;
2324

2425
public class SyslogMessageModifierVerifyTest extends TestCase {
26+
protected static final Logger LOG = Logger.getLogger("test");
27+
2528
public void testCRC32Verify() {
2629
SyslogIF syslog = Syslog.getInstance("udp");
2730

@@ -30,7 +33,7 @@ public void testCRC32Verify() {
3033
String message = "crc32 checksum Test 1234 ABCD";
3134

3235
String modifiedMessage = modifier.modify(syslog, SyslogFacility.kern, SyslogLevel.EMERGENCY, message);
33-
System.out.println(modifiedMessage);
36+
LOG.info(modifiedMessage);
3437

3538
if (!modifier.verify(message,"2399A0FD")) {
3639
fail();
@@ -72,7 +75,7 @@ public void testAdler32Verify() {
7275
String message = "adler32 checksum Test 4321 DCBA";
7376

7477
String modifiedMessage = modifier.modify(syslog,SyslogFacility.kern, SyslogLevel.EMERGENCY,message);
75-
System.out.println(modifiedMessage);
78+
LOG.info(modifiedMessage);
7679

7780
if (!modifier.verify(message,"A8D109B5")) {
7881
fail();
@@ -114,7 +117,7 @@ public void testHashVerify() {
114117
String message = "md5 hash Test 1212 ABAB";
115118

116119
String modifiedMessage = modifier.modify(syslog,SyslogFacility.kern, SyslogLevel.EMERGENCY,message);
117-
System.out.println(modifiedMessage);
120+
LOG.info(modifiedMessage);
118121

119122
if (!modifier.verify(message,"fqfK2PYV76Wv9yNQjLoVeg==")) {
120123
fail();
@@ -141,7 +144,7 @@ public void testMacVerify() {
141144
String message = "hmacmd5 Test 3434 DCDC";
142145

143146
String modifiedMessage = modifier.modify(syslog,SyslogFacility.kern, SyslogLevel.EMERGENCY,message);
144-
System.out.println(modifiedMessage);
147+
LOG.info(modifiedMessage);
145148

146149
if (!modifier.verify(message,"MfWJ4XhFiMlPwnFEJ401zA==")) {
147150
fail();

‎src/test/java/org/productivity/java/syslog4j/test/message/processor/SyslogMessageProcessorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void testCreatePacketData1() {
2828

2929
byte[] d = syslogMessageProcessor.createPacketData(h,m,s,l);
3030

31-
System.out.println(new String(d));
31+
LOG.info(new String(d));
3232
}
3333

3434
public void testCreatePacketData2() {
@@ -38,9 +38,9 @@ public void testCreatePacketData2() {
3838
byte[] d = null;
3939

4040
d = syslogMessageProcessor.createPacketData(h,m,0,8,null,"..".getBytes());
41-
System.out.println(new String(d));
41+
LOG.info(new String(d));
4242

4343
d = syslogMessageProcessor.createPacketData(h,m,8,6,"..".getBytes(),"..".getBytes());
44-
System.out.println(new String(d));
44+
LOG.info(new String(d));
4545
}
4646
}

‎src/test/java/org/productivity/java/syslog4j/test/net/BackLogTCPNetSyslog4jTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import java.util.List;
44

55
import org.junit.Ignore;
6+
import org.productivity.java.syslog4j.AbstractNetSyslog4jTest;
67
import org.productivity.java.syslog4j.Syslog;
78
import org.productivity.java.syslog4j.SyslogBackLogHandlerIF;
89
import org.productivity.java.syslog4j.SyslogIF;
910
import org.productivity.java.syslog4j.SyslogLevel;
1011
import org.productivity.java.syslog4j.SyslogRuntimeException;
1112
import org.productivity.java.syslog4j.impl.AbstractSyslogConfigIF;
1213
import org.productivity.java.syslog4j.server.SyslogServer;
13-
import org.productivity.java.syslog4j.test.net.base.AbstractNetSyslog4jTest;
1414
import org.productivity.java.syslog4j.util.SyslogUtility;
1515

1616
import com.google.common.collect.Lists;
@@ -25,15 +25,15 @@ public TestBackLogHandler(List<String> events) {
2525
}
2626

2727
public void initialize() throws SyslogRuntimeException {
28-
System.out.println(this.getClass().getName() + ": READY");
28+
LOG.info(this.getClass().getName() + ": READY");
2929
}
3030

3131
public void down(SyslogIF syslog, String reason) {
32-
System.out.println(this.getClass().getName() + ": DOWN");
32+
LOG.info(this.getClass().getName() + ": DOWN");
3333
}
3434

3535
public void up(SyslogIF syslog) {
36-
System.out.println(this.getClass().getName() + ": UP");
36+
LOG.info(this.getClass().getName() + ": UP");
3737
}
3838

3939
public void log(SyslogIF syslog, SyslogLevel level, String message, String reason) throws SyslogRuntimeException {

0 commit comments

Comments
 (0)