diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index e0c2622..0af213d 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -61,6 +61,7 @@ public class delegationServices { ClientID = (int) Lrequest.get("clientid"); } catch (Exception exrp) { System.out.println("Failed To Get Client ID"); + delegationTimer.DeleteTargetRequest(ClientID); } @@ -134,6 +135,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); //delegationTimer.trigger(); } } else { @@ -149,6 +151,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); } } catch(MongoCommandException ERC){ System.out.println("Malformed Request"); @@ -164,6 +167,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } } @@ -231,6 +235,7 @@ public class delegationServices { accountS.updateOne(searchQuery, updateQuery7); System.out.println("Updated Account"); //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } else { System.out.println("Sync Failure"); BasicDBObject searchQuery = new BasicDBObject(); @@ -245,6 +250,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } } else { System.out.println("Banned Account"); @@ -259,6 +265,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); } } catch(MongoCommandException ERC){ System.out.println("Malformed Request"); @@ -274,6 +281,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } } if (requesttype == 2) { @@ -336,6 +344,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery6); dCollection.updateOne(searchQuery, updateQuery7); //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } else { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -349,6 +358,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } } else { System.out.println("Banned Account"); @@ -363,6 +373,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); } } catch (Exception ERC) { BasicDBObject searchQuery = new BasicDBObject(); @@ -377,6 +388,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } } @@ -441,6 +453,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery7); //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } else { System.out.println("Login Failure"); BasicDBObject searchQuery = new BasicDBObject(); @@ -455,6 +468,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); + delegationTimer.DeleteTargetRequest(ClientID); } } else { System.out.println("Banned Account"); @@ -469,6 +483,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); } } catch (MongoCommandException ERC) { System.out.println("Malformed Request"); @@ -483,6 +498,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); + delegationTimer.DeleteTargetRequest(ClientID); //delegationTimer.trigger(); } } @@ -504,6 +520,7 @@ public class delegationServices { Lrequest.append("status",true); dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery); + delegationTimer.DeleteTargetRequest(ClientID); } @@ -523,15 +540,15 @@ public class delegationServices { dCollection.deleteMany(searchQueryF); System.out.println("Flushed Server"); } - public static void Clear () { - BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("status", true); - dCollection.deleteMany(searchQuery); - System.out.println("Flushed Server"); - delegationTimer.DeleteAllRequests(); + + public static void TargetDelete (int CID) { + BasicDBObject searchQuery = new BasicDBObject(); + searchQuery.append("clientid",CID); + dCollection.deleteMany(searchQuery); + System.out.println("Flushed a targeted request from the server"); - } + } public static void delegate () { userAuthetication(); diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationTimer.java b/src/main/java/com/jamesquinley/DelegationServices/delegationTimer.java index 4b37c86..bd0f649 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationTimer.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationTimer.java @@ -1,5 +1,7 @@ package com.jamesquinley.DelegationServices; +import org.bson.Document; + import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -21,17 +23,16 @@ public class delegationTimer { }; scheduler.scheduleAtFixedRate(runnable, 0, 1, TimeUnit.SECONDS); } - public static void DeleteAllRequests () + public static void DeleteTargetRequest (int CID) { final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); final Runnable runnable = new Runnable() { - int countdownStarter = 60; + int countdownStarter = 5; public void run() { countdownStarter--; if (countdownStarter <= 0) { - countdownStarter = 60; - delegationServices.Clear(); - //flushes all requests from the server + countdownStarter = 5; + delegationServices.TargetDelete(CID); scheduler.shutdown(); } } diff --git a/src/main/java/com/jamesquinley/init.java b/src/main/java/com/jamesquinley/init.java index cb3f34f..693a947 100644 --- a/src/main/java/com/jamesquinley/init.java +++ b/src/main/java/com/jamesquinley/init.java @@ -1,7 +1,4 @@ package com.jamesquinley; - -import static com.jamesquinley.DelegationServices.delegationTimer.DeleteAllRequests; - /** 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(); 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(); - DeleteAllRequests(); System.out.println("We've started everything, requests are now being served"); }