JamesQ/MatchmakingBackend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed Full 60 second purge, targeted clear to help prevent record transit loss (Resulting in a client error, and possible crash)

Browse Source
This commit is contained in:
James Quinley 2022-02-08 17:27:43 -08:00
parent 7bb1643216
commit 3d895026e1
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
View File

@ -61,6 +61,7 @@ public class delegationServices {
ClientID = (int) Lrequest.get("clientid"); ClientID = (int) Lrequest.get("clientid");
} catch (Exception exrp) { } catch (Exception exrp) {
System.out.println("Failed To Get Client ID"); System.out.println("Failed To Get Client ID");
delegationTimer.DeleteTargetRequest(ClientID);
} }
@ -134,6 +135,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
//delegationTimer.trigger(); //delegationTimer.trigger();
} }
} else { } else {
@ -149,6 +151,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
} }
} catch(MongoCommandException ERC){ } catch(MongoCommandException ERC){
System.out.println("Malformed Request"); System.out.println("Malformed Request");
@ -164,6 +167,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} }
@ -231,6 +235,7 @@ public class delegationServices {
accountS.updateOne(searchQuery, updateQuery7); accountS.updateOne(searchQuery, updateQuery7);
System.out.println("Updated Account"); System.out.println("Updated Account");
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} else { } else {
System.out.println("Sync Failure"); System.out.println("Sync Failure");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
@ -245,6 +250,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} else { } else {
System.out.println("Banned Account"); System.out.println("Banned Account");
@ -259,6 +265,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
} }
} catch(MongoCommandException ERC){ } catch(MongoCommandException ERC){
System.out.println("Malformed Request"); System.out.println("Malformed Request");
@ -274,6 +281,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} }
if (requesttype == 2) { if (requesttype == 2) {
@ -336,6 +344,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery6); dCollection.updateOne(searchQuery, updateQuery6);
dCollection.updateOne(searchQuery, updateQuery7); dCollection.updateOne(searchQuery, updateQuery7);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} else { } else {
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("clientid", ClientID); searchQuery.append("clientid", ClientID);
@ -349,6 +358,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} else { } else {
System.out.println("Banned Account"); System.out.println("Banned Account");
@ -363,6 +373,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
} }
} catch (Exception ERC) { } catch (Exception ERC) {
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
@ -377,6 +388,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} }
@ -441,6 +453,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery8);
dCollection.updateOne(searchQuery, updateQuery7); dCollection.updateOne(searchQuery, updateQuery7);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} else { } else {
System.out.println("Login Failure"); System.out.println("Login Failure");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
@ -455,6 +468,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequest(ClientID);
} }
} else { } else {
System.out.println("Banned Account"); System.out.println("Banned Account");
@ -469,6 +483,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
} }
} catch (MongoCommandException ERC) { } catch (MongoCommandException ERC) {
System.out.println("Malformed Request"); System.out.println("Malformed Request");
@ -483,6 +498,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequest(ClientID);
//delegationTimer.trigger(); //delegationTimer.trigger();
} }
} }
@ -504,6 +520,7 @@ public class delegationServices {
Lrequest.append("status",true); Lrequest.append("status",true);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
delegationTimer.DeleteTargetRequest(ClientID);
} }
@ -523,15 +540,15 @@ public class delegationServices {
dCollection.deleteMany(searchQueryF); dCollection.deleteMany(searchQueryF);
System.out.println("Flushed Server"); System.out.println("Flushed Server");
} }
public static void Clear () {
BasicDBObject searchQuery = new BasicDBObject(); public static void TargetDelete (int CID) {
searchQuery.append("status", true); BasicDBObject searchQuery = new BasicDBObject();
dCollection.deleteMany(searchQuery); searchQuery.append("clientid",CID);
System.out.println("Flushed Server"); dCollection.deleteMany(searchQuery);
delegationTimer.DeleteAllRequests(); System.out.println("Flushed a targeted request from the server");
} }
public static void delegate () public static void delegate ()
{ {
userAuthetication(); userAuthetication();

11
src/main/java/com/jamesquinley/DelegationServices/delegationTimer.java
View File

@ -1,5 +1,7 @@
package com.jamesquinley.DelegationServices; package com.jamesquinley.DelegationServices;
import org.bson.Document;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -21,17 +23,16 @@ public class delegationTimer {
}; };
scheduler.scheduleAtFixedRate(runnable, 0, 1, TimeUnit.SECONDS); scheduler.scheduleAtFixedRate(runnable, 0, 1, TimeUnit.SECONDS);
} }
public static void DeleteAllRequests () public static void DeleteTargetRequest (int CID)
{ {
final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
final Runnable runnable = new Runnable() { final Runnable runnable = new Runnable() {
int countdownStarter = 60; int countdownStarter = 5;
public void run() { public void run() {
countdownStarter--; countdownStarter--;
if (countdownStarter <= 0) { if (countdownStarter <= 0) {
countdownStarter = 60; countdownStarter = 5;
delegationServices.Clear(); delegationServices.TargetDelete(CID);
//flushes all requests from the server
scheduler.shutdown(); scheduler.shutdown();
} }
} }

4
src/main/java/com/jamesquinley/init.java
View File

@ -1,7 +1,4 @@
package com.jamesquinley; package com.jamesquinley;
import static com.jamesquinley.DelegationServices.delegationTimer.DeleteAllRequests;
/** /**
Hey there! This is the source code for AOTSK-Delegation Server, for login Hey there! This is the source code for AOTSK-Delegation Server, for login
* *
@ -13,7 +10,6 @@ public class init
com.jamesquinley.DelegationServices.delegationServices.Purge(); com.jamesquinley.DelegationServices.delegationServices.Purge();
System.out.println( "We're starting the login delegation server, please wait one moment while we check a few things."); System.out.println( "We're starting the login delegation server, please wait one moment while we check a few things.");
com.jamesquinley.DelegationServices.delegationTimer.trigger(); com.jamesquinley.DelegationServices.delegationTimer.trigger();
DeleteAllRequests();
System.out.println("We've started everything, requests are now being served"); System.out.println("We've started everything, requests are now being served");
} }