X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosLog.java;h=1cac6b5205a1b6c731b42447a2ef132919114018;hb=HEAD;hp=3111a2cda462bd153e1345ca7a27f27032e18669;hpb=297eb795b24ec31f6599f48bc8c3769557a7ec6f;p=fw%2Faltos

diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index 3111a2cd..7dc9fd4c 100644
--- a/altoslib/AltosLog.java
+++ b/altoslib/AltosLog.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.text.*;
@@ -37,6 +37,12 @@ public class AltosLog implements Runnable {
 	Thread				log_thread;
 	AltosFile			file;
 	AltosLink			link;
+	AltosLogTrace			trace;
+
+	private void trace(String format, Object ... arguments) {
+		if (trace != null)
+			trace.trace(format, arguments);
+	}
 
 	private void close_log_file() {
 		if (log_file != null) {
@@ -62,10 +68,25 @@ public class AltosLog implements Runnable {
 	}
 
 	boolean open (AltosCalData cal_data) throws IOException, InterruptedException {
+		trace("open serial %d flight %d receiver_serial %d",
+		      cal_data.serial,
+		      cal_data.flight,
+		      cal_data.receiver_serial);
+
 		AltosFile	a = new AltosFile(cal_data);
 
-		log_file = new FileWriter(a, true);
+		trace("open file %s\n", a.getPath());
+
+		try {
+			log_file = new FileWriter(a, true);
+		} catch (IOException ie) {
+			log_file = null;
+			trace("open file failed\n");
+			if (trace != null)
+				trace.open_failed(a);
+		}
 		if (log_file != null) {
+			trace("open file success\n");
 			while (!pending_queue.isEmpty()) {
 				String s = pending_queue.take();
 				log_file.write(s);
@@ -79,6 +100,7 @@ public class AltosLog implements Runnable {
 	}
 
 	public void run () {
+		trace("log run start\n");
 		try {
 			AltosConfigData	receiver_config = link.config_data();
 			AltosCalData	cal_data = new AltosCalData();
@@ -117,21 +139,30 @@ public class AltosLog implements Runnable {
 					pending_queue.put(line.line);
 			}
 		} catch (InterruptedException ie) {
+			trace("interrupted exception\n");
 		} catch (TimeoutException te) {
+			trace("timeout exception\n");
 		} catch (IOException ie) {
+			trace("io exception %s message %s\n", ie.toString(), ie.getMessage());
 		}
+		trace("log run done\n");
 		close();
 	}
 
-	public AltosLog (AltosLink link) {
+	public AltosLog (AltosLink link, AltosLogTrace trace) {
 		pending_queue = new LinkedBlockingQueue<String> ();
 		input_queue = new LinkedBlockingQueue<AltosLine> ();
 		link.add_monitor(input_queue);
 		serial = -1;
 		flight = -1;
+		this.trace = trace;
 		this.link = link;
 		log_file = null;
 		log_thread = new Thread(this);
 		log_thread.start();
 	}
+
+	public AltosLog (AltosLink link) {
+		this(link, null);
+	}
 }