From d9a3de947642142e2c40b0a0f8b14a6ba88b7b8d Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Tue, 11 Jan 2022 22:59:38 -0800
Subject: [PATCH] logging, self test refinements
---
.../dis7/utilities/stream/PduRecorder.java | 25 +++++++++---------
.../stream/PduRecorderSelfTestLog.txt | Bin 64612 -> 64723 bytes
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/edu/nps/moves/dis7/utilities/stream/PduRecorder.java b/src/edu/nps/moves/dis7/utilities/stream/PduRecorder.java
index 7727f79313..eb1e80d6f6 100644
--- a/src/edu/nps/moves/dis7/utilities/stream/PduRecorder.java
+++ b/src/edu/nps/moves/dis7/utilities/stream/PduRecorder.java
@@ -107,12 +107,12 @@ public class PduRecorder // implements PduReceiver
private DisThreadedNetworkInterface disThreadedNetworkInterface;
private DisThreadedNetworkInterface.RawPduListener disRawPduListener;
- private Long startNanoTime = null;
- private final StringBuilder sb = new StringBuilder();
- private final Base64.Encoder base64Encoder = Base64.getEncoder();
- private final int pduCount = 0; // debug
- private boolean headerWritten = false;
- private boolean running = true; // starts recording by default
+ private Long startNanoTime = null;
+ private StringBuilder sb = new StringBuilder();
+ private Base64.Encoder base64Encoder = Base64.getEncoder();
+ private int pduCount = 0; // debug
+ private boolean headerWritten = false;
+ private boolean running = true; // starts recording by default
private void initialize()
{
@@ -170,9 +170,9 @@ public class PduRecorder // implements PduReceiver
{
initialize();
outputDirectoryPath = new File(initialOutputDirectory).toPath();
- setDescriptor("PduRecorder"); // default
- setAddress(initialAddress);
- setPort (initialPort);
+ descriptor = "PduRecorder"; // default
+ disAddress = initialAddress;
+ disPort = initialPort;
}
/**
@@ -292,7 +292,7 @@ public class PduRecorder // implements PduReceiver
logFileWriter.close(); // a flush occurs first during a close
}
catch (IOException ex) {
- Logger.getLogger(PduRecorder.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.getLogger(PduRecorder.class.getSimpleName()).log(Level.SEVERE, null, ex);
}
System.err.flush(); // ensure all output sent
System.out.flush(); // ensure all output sent
@@ -399,8 +399,9 @@ public class PduRecorder // implements PduReceiver
ex.printStackTrace();
throw new RuntimeException("Fatal exception writing DIS log file in PduRecorder thread, encodingPduLog=" + encodingPduLog + ": " + ex);
}
- if (false) // debug
- System.out.println("PduRecorder: pduCount="+ pduCount);
+ pduCount = pduCount + 1;
+// if (false) // debug
+// System.out.println("PduRecorder: pduCount="+ pduCount);
sb.setLength(0);
}
diff --git a/src/edu/nps/moves/dis7/utilities/stream/PduRecorderSelfTestLog.txt b/src/edu/nps/moves/dis7/utilities/stream/PduRecorderSelfTestLog.txt
index 7c2006276dea525053d5568ee6e289547c9f438b..5f4f7b7e52bcaf994de16d2d07fe6a2714a60474 100644
GIT binary patch
delta 342
zcmaFzgZc7L<_(XS<pLc2+yfNCGK)$|6LS<?OEOZ6@={9_98(etN>Ym^Z(P+idDAMn
z$+shPC$mP$Fvd=vzdCVp126aHDAo(glNV@kPL`?7o9v(?I(beFl&&q`yg|!LbMk^^
zER+BIPyy<52I-jW@UwRFfsiW3$@ae!C-*YTPu}ypZu0(>DwEU0H<06wq{$BH?3;Tc
zgGDD76mm|^&TpRlBCl%l{XEXi@A9{s0qyk$+F1uy<+VH?WN*@DwUxPyBwMz5{_05I
m$u-L~fo8f)PFTmj+2Q9G#?AJ>r5L#_6^c`n^Yc=QHMs!4FOM4l
delta 357
zcmccolljRH<_(XS<vjCBQgbwdG!?=#b=@)*%v=>5Ba93U6b#J_d_AfrPvnxFEX$HR
z`JuAR<P|KsVA?M-VX^}|_vSd(3(AuNbT}vP(yW?1L7j85xn}cbTdjkdlb0>iWYN;n
zQUEKLT3!oQ{wE}#kt;PPEhM$LL_<?yGVjWy$-T_-n_q_oF_Pho&3=))MJMwYa890@
zUo|<tkz?{M>7vOBMM9e;3bvcUt=}xQ{0p+Rn|W7WAj`UUt0R0T{|nYYn7r#Js>y4A
TOEYp?C={nA=jWvqYjObqj9Gjr
--
GitLab