michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added keystroke frequency limit

Browse Source 
Updated client and server log format

#story[988] #pair[hyi25, zyt10]
This commit is contained in:
Zhi You Tan
2017-07-25 15:13:48 +12:00
parent 3785cd705f
commit 1a867be387
5 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/MainServerThread.java
+2 -1
View File
@@ -1,5 +1,6 @@
package seng302.gameServer;
import java.time.LocalDateTime;
import java.util.Observable;
import seng302.client.ClientPacketParser;
import seng302.models.Player;
@@ -108,7 +109,7 @@ public class MainServerThread extends Observable implements Runnable, PacketBuff
static void serverLog(String message, int logLevel){
if(logLevel <= LOG_LEVEL){
System.out.println("[SERVER] " + message);
System.out.println("[SERVER " + LocalDateTime.now().toLocalTime().toString() + "] " + message);
}
}
src/main/java/seng302/gameServer/ServerToClientThread.java
+7 -3
View File
@@ -6,6 +6,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.net.SocketException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Observable;
@@ -97,7 +99,7 @@ public class ServerToClientThread implements Runnable, Observer {
static void serverLog(String message, int logLevel){
if(logLevel <= LOG_LEVEL){
System.out.println("[SERVER] " + message);
System.out.println("[SERVER " + LocalDateTime.now().toLocalTime().toString() + "] " + message);
}
}
@@ -234,8 +236,8 @@ public class ServerToClientThread implements Runnable, Observer {
}
} catch (Exception e) {
// TODO: 24/07/17 zyt10 - fix a logic here when a client disconnected
serverLog("ERROR OCCURRED, CLOSING SERVER CONNECTION: " + socket.getRemoteSocketAddress().toString(), 1);
e.printStackTrace();
// serverLog("ERROR OCCURRED, CLOSING SERVER CONNECTION: " + socket.getRemoteSocketAddress().toString(), 1);
// e.printStackTrace();
closeSocket();
return;
}
@@ -346,6 +348,8 @@ public class ServerToClientThread implements Runnable, Observer {
public void sendMessage(Message message){
try {
os.write(message.getBuffer());
} catch (SocketException e) {
serverLog("Player " + sourceId + " " + e.getMessage(), 0);
} catch (IOException e) {
e.printStackTrace();
}