Skip to content

Commit 00963b6

Browse files
thsc42thsc42
committed
improved logging
1 parent e70e7f2 commit 00963b6

File tree

6 files changed

+25
-73
lines changed

6 files changed

+25
-73
lines changed

‎src/main/java/net/sharksystem/asap/ASAPInternalPeerWrapper.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.sharksystem.asap.engine.ASAPInternalPeer;
66
import net.sharksystem.asap.protocol.ASAPConnection;
77
import net.sharksystem.asap.utils.PeerIDHelper;
8+
import net.sharksystem.utils.Log;
89

910
import java.io.IOException;
1011
import java.io.InputStream;
@@ -20,7 +21,7 @@ protected void setInternalPeer(ASAPInternalPeer peer) {
2021
this.peer = peer;
2122
this.peer.addOnlinePeersChangedListener(this);
2223

23-
this.log("activate online messages on that peer");
24+
Log.writeLog(this, "activate online messages on that peer");
2425
this.peer.activateOnlineMessages();
2526
}
2627

‎src/main/java/net/sharksystem/asap/ASAPListenerManagingPeer.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,4 @@ public void addASAPEnvironmentChangesListener(ASAPEnvironmentChangesListener cha
5252
public void removeASAPEnvironmentChangesListener(ASAPEnvironmentChangesListener changesListener) {
5353
this.environmentChangesListenerManager.removeASAPEnvironmentChangesListener(changesListener);
5454
}
55-
56-
////////////////////////////////////////////////////////////////////////////////////////////////////////
57-
// util //
58-
////////////////////////////////////////////////////////////////////////////////////////////////////////
59-
60-
protected void log(String msg) {
61-
StringBuilder sb = new StringBuilder();
62-
sb.append(this.getPeerID());
63-
sb.append(": ");
64-
sb.append(msg);
65-
66-
System.out.println(sb.toString());
67-
}
6855
}

‎src/main/java/net/sharksystem/asap/ASAPPeerFS.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public ASAPPeerFS(CharSequence owner, CharSequence rootFolder,
2222
}
2323

2424
public void overwriteChuckReceivedListener(ASAPChunkAssimilatedListener listener) {
25-
Log.writeLogErr(this, "do not use chunk received listener - message received listener is better");
25+
Log.writeLogErr(this, this.getPeerID(), "do not use chunk received listener - message received listener is better");
2626
this.chunkReceivedListener = listener;
2727
}
2828

@@ -53,19 +53,24 @@ private void chunkAssimilated(ASAPMessages receivedMessages, CharSequence format
5353
sb.append("\n");
5454
sb.append(hopListString);
5555
sb.append("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
56-
this.log(sb.toString());
56+
Log.writeLog(this, this.getPeerID(), sb.toString());
5757

5858
if(callListener) {
5959
// call listener
60-
this.log("notify listener");
60+
String numberListeners = "null";
61+
if(this.asapMessageReceivedListenerManager != null) {
62+
numberListeners = String.valueOf(this.asapMessageReceivedListenerManager.getNumberListener());
63+
}
64+
65+
Log.writeLog(this, this.getPeerID(), "notify listeners; number: " + numberListeners);
6166
if (this.asapMessageReceivedListenerManager.getNumberListener() > 0) {
6267
this.asapMessageReceivedListenerManager.notifyReceived(
6368
format, receivedMessages, true,
6469
senderE2E.toString(), asapHopList);
6570
}
6671

6772
if (this.asapChannelContentChangedListenerManager.getNumberListener() > 0) {
68-
this.log("notify channel content changed listener");
73+
Log.writeLog(this, this.getPeerID(),"notify channel content changed listener");
6974
this.asapChannelContentChangedListenerManager.notifyChanged(format, uri, era, true);
7075
}
7176
}
@@ -86,11 +91,11 @@ public void transientMessagesReceived(ASAPMessages transientMessages, ASAPHop as
8691
public void chunkStored(String format, String senderE2E, String uri, int era,
8792
List<ASAPHop> asapHopList) throws IOException {
8893
if(this.chunkReceivedListener != null) {
89-
this.log("chunk received listener set - call this one");
94+
Log.writeLog(this, this.getPeerID(),"chunk received listener set - call this one");
9095
this.chunkReceivedListener.chunkStored(format, senderE2E, uri, era, asapHopList);
9196
this.chunkAssimilated(null, format, senderE2E, uri, era, asapHopList, false);
9297
} else {
93-
this.log("extract messages from chunk and notify listener");
98+
Log.writeLog(this, this.getPeerID(),"extract messages from chunk and notify listener");
9499
ASAPMessages receivedMessages =
95100
ASAPLogHelper.getMessagesByChunkReceivedInfos(format, senderE2E, uri, this.rootFolder, era);
96101

@@ -123,7 +128,7 @@ public void sendASAPMessage(CharSequence appName, CharSequence uri, byte[] messa
123128
}
124129
*/
125130
} catch (IOException e) {
126-
this.log(e.getLocalizedMessage());
131+
Log.writeLog(this, this.getPeerID(),e.getLocalizedMessage());
127132
throw new ASAPException("problems getting asap engine", e);
128133
}
129134
}

‎src/main/java/net/sharksystem/asap/apps/testsupport/ASAPTestPeerFS.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.sharksystem.asap.ASAPPeerFS;
44
import net.sharksystem.asap.ASAPException;
55
import net.sharksystem.asap.EncounterConnectionType;
6+
import net.sharksystem.utils.Log;
67

78
import java.io.IOException;
89
import java.net.ServerSocket;
@@ -31,7 +32,7 @@ public void run() {
3132
try {
3233
ASAPTestPeerFS.this.socket = ASAPTestPeerFS.this.serverSocket.accept();
3334
} catch (IOException e) {
34-
ASAPTestPeerFS.this.log("fatal while waiting for client to connect: "
35+
Log.writeLog(ASAPTestPeerFS.this,"fatal while waiting for client to connect: "
3536
+ e.getLocalizedMessage());
3637
}
3738

@@ -67,7 +68,7 @@ public void run() {
6768
ASAPTestPeerFS.this.socket.getOutputStream(),
6869
EncounterConnectionType.INTERNET);
6970
} catch (IOException | ASAPException e) {
70-
ASAPTestPeerFS.this.log("fatal while connecting: " + e.getLocalizedMessage());
71+
Log.writeLog(ASAPTestPeerFS.this,"fatal while connecting: " + e.getLocalizedMessage());
7172
}
7273
}
7374
}).start();

‎src/main/java/net/sharksystem/asap/engine/ASAPEngine.java‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -470,71 +470,21 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimilationPDU, A
470470
//>>>>>>>>>>>>>>>>>>>debug
471471

472472
if(listener != null) {
473-
/////// notify listeners - if any and do it in a separate thread
474-
// no extra thread required - it is handled by ASAPPeer Wrapper
475-
// NotifyListenerThread notifyListenerThread = new NotifyListenerThread(listener);
476473
if(eraSender != ASAP.TRANSIENT_ERA) {
477-
// notifyListenerThread.chunkStored(this.format,
478474
listener.chunkStored(this.format,
479475
senderE2E,
480476
uri,
481477
eraSender,
482478
asapHopList
483479
);
484480
} else {
485-
// notifyListenerThread.transientMessagesReceived(transientMessages, lastHop);
486481
listener.transientMessagesReceived(transientMessages, lastHop);
487482
}
488483

489484
} else {
490485
Log.writeLog(this, this.toString(), "no chunk assimilated listener found");
491486
}
492487
}
493-
/*
494-
private class NotifyListenerThread extends Thread {
495-
private final ASAPChunkAssimilatedListener listener;
496-
private String format;
497-
private String senderE2E;
498-
private int eraSender;
499-
private List<ASAPHop> asapHopList;
500-
private ASAPInMemoTransientMessages transientMessages;
501-
private ASAPHop lastHop;
502-
private String uri;
503-
504-
private NotifyListenerThread(ASAPChunkAssimilatedListener listener) {
505-
this.listener = listener;
506-
}
507-
508-
public void chunkStored(String format, String senderE2E, String uri, int eraSender, List<ASAPHop> asapHopList) {
509-
this.format = format;
510-
this.senderE2E = senderE2E;
511-
this.uri = uri;
512-
this.eraSender = eraSender;
513-
this.asapHopList = asapHopList;
514-
this.start();
515-
}
516-
517-
public void transientMessagesReceived(ASAPInMemoTransientMessages transientMessages, ASAPHop lastHop) {
518-
this.transientMessages = transientMessages;
519-
this.lastHop = lastHop;
520-
this.start();
521-
}
522-
523-
public void run() {
524-
Log.writeLog(this, "thread notifies listener about received messages");
525-
try {
526-
if(this.transientMessages != null) {
527-
this.listener.transientMessagesReceived(this.transientMessages, this.lastHop);
528-
} else {
529-
this.listener.chunkStored(this.format, this.senderE2E, this.uri, this.eraSender, this.asapHopList);
530-
}
531-
} catch (IOException e) {
532-
Log.writeLogErr(this, "problems notifying listener about received messages: "
533-
+ e.getLocalizedMessage());
534-
}
535-
}
536-
}
537-
*/
538488
private ASAPInternalChunk getIncomingChunk(String encounteredPeer, ASAP_AssimilationPDU_1_0 asapAssimilationPDU)
539489
throws IOException, ASAPException {
540490

‎src/main/java/net/sharksystem/utils/Log.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ public static void writeLog(Object o, String parameter, String message) {
4242
Log.outStream.println(Log.startLog(o, parameter) + message);
4343
}
4444

45+
public static void writeLog(Object o, CharSequence parameter, String message) {
46+
Log.outStream.println(Log.startLog(o, String.valueOf(parameter)) + message);
47+
}
48+
4549
public static void writeLog(Object o, String message) {
4650
writeLog(o, null, message);
4751
}
@@ -58,6 +62,10 @@ public static void writeLogErr(Object o, String parameter, String message) {
5862
Log.errStream.println(Log.startLog(o, parameter) + message);
5963
}
6064

65+
public static void writeLogErr(Object o, CharSequence parameter, String message) {
66+
Log.errStream.println(Log.startLog(o, String.valueOf(parameter)) + message);
67+
}
68+
6169
public static void writeLogErr(Object o, String message) {
6270
writeLogErr(o, null, message);
6371
}

0 commit comments

Comments
 (0)