Skip to content

Commit 2b3a895

Browse files
authored
Fix log close (#55)
1 parent 9852dbd commit 2b3a895

File tree

1 file changed

+15
-28
lines changed

1 file changed

+15
-28
lines changed

src/main/java/us/ihmc/robotDataLogger/logger/YoVariableLoggerListener.java

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,10 @@
11
package us.ihmc.robotDataLogger.logger;
22

3-
import java.io.File;
4-
import java.io.FileNotFoundException;
5-
import java.io.FileOutputStream;
6-
import java.io.IOException;
7-
import java.nio.ByteBuffer;
8-
import java.nio.LongBuffer;
9-
import java.nio.channels.FileChannel;
10-
import java.util.ArrayList;
11-
import java.util.List;
12-
import java.util.concurrent.ExecutionException;
13-
import java.util.concurrent.ExecutorService;
14-
import java.util.concurrent.Executors;
15-
import java.util.concurrent.Future;
16-
import java.util.concurrent.TimeUnit;
17-
import java.util.concurrent.TimeoutException;
18-
import java.util.function.Consumer;
19-
203
import us.ihmc.commons.Conversions;
214
import us.ihmc.commons.MathTools;
225
import us.ihmc.idl.serializers.extra.YAMLSerializer;
236
import us.ihmc.log.LogTools;
24-
import us.ihmc.robotDataLogger.Announcement;
25-
import us.ihmc.robotDataLogger.CameraConfiguration;
26-
import us.ihmc.robotDataLogger.CameraSettings;
27-
import us.ihmc.robotDataLogger.CameraSettingsLoader;
28-
import us.ihmc.robotDataLogger.Handshake;
29-
import us.ihmc.robotDataLogger.HandshakeFileType;
30-
import us.ihmc.robotDataLogger.HandshakePubSubType;
31-
import us.ihmc.robotDataLogger.YoVariableClientInterface;
32-
import us.ihmc.robotDataLogger.YoVariablesUpdatedListener;
7+
import us.ihmc.robotDataLogger.*;
338
import us.ihmc.robotDataLogger.handshake.LogHandshake;
349
import us.ihmc.robotDataLogger.handshake.YoVariableHandshakeParser;
3510
import us.ihmc.robotDataLogger.jointState.JointState;
@@ -40,6 +15,18 @@
4015
import us.ihmc.tools.compression.SnappyUtils;
4116
import us.ihmc.yoVariables.variable.YoVariable;
4217

18+
import java.io.File;
19+
import java.io.FileNotFoundException;
20+
import java.io.FileOutputStream;
21+
import java.io.IOException;
22+
import java.nio.ByteBuffer;
23+
import java.nio.LongBuffer;
24+
import java.nio.channels.FileChannel;
25+
import java.util.ArrayList;
26+
import java.util.List;
27+
import java.util.concurrent.*;
28+
import java.util.function.Consumer;
29+
4330
public class YoVariableLoggerListener implements YoVariablesUpdatedListener
4431
{
4532
/**
@@ -434,12 +421,12 @@ public void disconnected()
434421
yoVariableSummarizer.writeData(new File(tempDirectory, summaryFilename));
435422
}
436423

424+
doneListener.accept(request);
425+
437426
tempDirectory.renameTo(finalDirectory);
438427

439428
// This gets printed here because it's been successful and is the final location of the log directory
440429
LogTools.info("Log is saved as: " + finalDirectory);
441-
442-
doneListener.accept(request);
443430
}
444431

445432
if (alreadyShutDown)

0 commit comments

Comments
 (0)