Add more log output to file transfer classes

2 files changed, 39 insertions, 3 deletions

diff --git a/src/main/java/org/openslx/filetransfer/util/ChunkList.java b/src/main/java/org/openslx/filetransfer/util/ChunkList.java
index a7e0fdd..bd927b1 100644
--- a/src/main/java/org/openslx/filetransfer/util/ChunkList.java
+++ b/src/main/java/org/openslx/filetransfer/util/ChunkList.java
@@ -415,6 +415,35 @@ public class ChunkList
 		return sb.toString();
 	}
 
+	public synchronized String getStats()
+	{
+		int complete = 0, copying = 0, hashing = 0, missing = 0, qfc = 0, uploading = 0;
+		for ( FileChunk chunk : allChunks ) {
+			switch ( chunk.status ) {
+			case COMPLETE:
+				complete++;
+				break;
+			case COPYING:
+				copying++;
+				break;
+			case HASHING:
+				hashing++;
+				break;
+			case MISSING:
+				missing++;
+				break;
+			case QUEUED_FOR_COPY:
+				qfc++;
+				break;
+			case UPLOADING:
+				uploading++;
+				break;
+			}
+		}
+		return "(" + allChunks.size() + ":" + completeChunks.size() + "/" + pendingChunks.size() + "/" + missingChunks.size() + ")"
+				+ " (" + complete + "/" + copying + "/" + hashing + "/" + missing + "/" + qfc + "/" + uploading + ")";
+	}
+
 	public synchronized boolean isEmpty()
 	{
 		return allChunks.isEmpty();
diff --git a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
index dfe007b..9c322fd 100644
--- a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
+++ b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
@@ -154,7 +154,9 @@ public abstract class IncomingTransferBase extends AbstractTransfer implements H
 	@Override
 	public final int getActiveConnectionCount()
 	{
-		return downloads.size();
+		synchronized ( downloads ) {
+			return downloads.size();
+		}
 	}
 
 	public final boolean hashesEqual( List<ByteBuffer> blockHashes )
@@ -390,7 +392,7 @@ public abstract class IncomingTransferBase extends AbstractTransfer implements H
 				currentChunk = chunks.getMissing();
 			} catch ( InterruptedException e ) {
 				Thread.currentThread().interrupt();
-				LOGGER.info("Incoming transfer connection was interrupted");
+				LOGGER.info( "Incoming transfer connection was interrupted" );
 				return null;
 			}
 			if ( currentChunk == null ) {
@@ -464,6 +466,7 @@ public abstract class IncomingTransferBase extends AbstractTransfer implements H
 				@Override
 				public void run()
 				{
+					int active;
 					try {
 						CbHandler cbh = new CbHandler( connection );
 						if ( connection.download( cbh, cbh ) ) {
@@ -482,7 +485,7 @@ public abstract class IncomingTransferBase extends AbstractTransfer implements H
 								}
 								chunkStatusChanged( cbh.currentChunk );
 							}
-							LOGGER.debug( "Connection for " + getTmpFileName().getAbsolutePath() + " dropped" );
+							LOGGER.info( "Connection for " + getTmpFileName().getAbsolutePath() + " dropped prematurely" );
 						}
 						if ( state != TransferState.FINISHED && state != TransferState.ERROR ) {
 							lastActivityTime.set( System.currentTimeMillis() );
@@ -490,6 +493,7 @@ public abstract class IncomingTransferBase extends AbstractTransfer implements H
 					} finally {
 						synchronized ( downloads ) {
 							downloads.remove( connection );
+							active = downloads.size();
 						}
 					}
 					if ( chunks.isComplete() ) {
@@ -500,6 +504,9 @@ public abstract class IncomingTransferBase extends AbstractTransfer implements H
 						if ( localCopyManager != null ) {
 							localCopyManager.trigger();
 						}
+						LOGGER.info( "Downloader disconnected, " + active + " still running. " + chunks.getStats() );
+					} else {
+						LOGGER.info( "Downloader disconnected, state=" + state + ". " + chunks.getStats() );
 					}
 				}
 			} );