From 298ccae7f81249e14809016e9b1aab5fbb67117a Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Mon, 21 Jun 2010 23:23:53 +0200
Subject: [PATCH] tcpuploader: add exception catcher

---
 src/TcpUploader.scala | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/TcpUploader.scala b/src/TcpUploader.scala
index fea246d..ffcc969 100644
--- a/src/TcpUploader.scala
+++ b/src/TcpUploader.scala
@@ -31,6 +31,7 @@ class TcpUploader(service : AprsService, hostname : String, login : String, filt
 
 	def stop() {
 		conn.shutdown()
+		conn.interrupt()
 		conn.join()
 	}
 
@@ -62,21 +63,21 @@ class TcpUploader(service : AprsService, hostname : String, login : String, filt
 
 		override def run() {
 			Log.d(TAG, "TcpSocketThread.run()")
-			init_socket()
+			catchLog("init_socket", init_socket)
 			while (running) {
 				try {
-					if (!socket.isConnected()) {
-						Log.d(TAG, "reconnecting in 30s")
-						Thread.sleep(30*1000)
-						init_socket()
-					}
 					Log.d(TAG, "waiting for data...")
 					var line : String = null
-					while ({ line = reader.readLine(); line != null }) {
+					while (running && { line = reader.readLine(); line != null }) {
 						Log.d(TAG, "recv: " + line)
 						if (line(0) != '#')
 							service.postSubmit(line)
 					}
+					if (running && (line == null || !socket.isConnected())) {
+						Log.d(TAG, "reconnecting in 30s")
+						Thread.sleep(30*1000)
+						init_socket()
+					}
 				} catch {
 					case e : Exception => Log.d(TAG, "Exception" + e)
 				}
@@ -91,12 +92,22 @@ class TcpUploader(service : AprsService, hostname : String, login : String, filt
 			} else "TCP disconnected"
 		}
 
+		def catchLog(tag : String, fun : ()=>Unit) {
+			Log.d(TAG, "catchLog(" + tag + ")")
+			try {
+				fun()
+			} catch {
+			case e : Exception => Log.d(TAG, tag + " execption: " + e)
+			}
+		}
+
 		def shutdown() {
+			Log.d(TAG, "shutdown()")
 			this.synchronized {
 				running = false
-				socket.shutdownInput()
-				socket.shutdownOutput()
-				socket.close()
+				catchLog("shutdownInput", socket.shutdownInput)
+				catchLog("shutdownOutput", socket.shutdownOutput)
+				catchLog("socket.close", socket.close)
 			}
 		}
 	}