Moved Deletion from init request to finished request start state.
This requires an immediate server update, clients will be down (for a short time) but won't require an update to use the new version of the login server. -JQUI
This commit is contained in:
James Quinley
parent
65de073358
commit
18d8ddee7e
@ -55,6 +55,7 @@ public class delegationServices {
|
||||
if(requesttype == 0 || requesttype == 1 || requesttype == 2 || requesttype == 3 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype ==7 || requesttype == 8 || requesttype ==9 || requesttype ==10 || requesttype ==11 || requesttype ==12) {
|
||||
if (requesttype == 7 || requesttype == 12 || requesttype == 4 || requesttype == 5 || requesttype == 6) {
|
||||
System.out.println("An Excluded Request (7MAL, 12S, 4C, 5C, 6C) Has Been Detected, Ignoring");
|
||||
//Thinking of moving all purge timer call to here to centralize deletion decision.
|
||||
}
|
||||
|
||||
try {
|
||||
@ -67,7 +68,6 @@ public class delegationServices {
|
||||
|
||||
|
||||
if (requesttype == 0) {
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
int CTOKEN = (int) Lrequest.get("Token");
|
||||
System.out.println("Sync Request (Read)");
|
||||
Document accountServer;
|
||||
@ -123,6 +123,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery5);
|
||||
dCollection.updateOne(searchQuery, updateQuery6);
|
||||
dCollection.updateOne(searchQuery, updateQuery7);
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
} else {
|
||||
System.out.println("Sync Failure");
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
@ -136,7 +137,7 @@ public class delegationServices {
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
//delegationTimer.trigger();
|
||||
}
|
||||
} else {
|
||||
@ -152,7 +153,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");
|
||||
@ -168,13 +169,12 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
//delegationTimer.trigger();
|
||||
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
}
|
||||
}
|
||||
|
||||
//sync read request
|
||||
if (requesttype == 1) {
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
System.out.println("Sync Request (Write)");
|
||||
int CTOKEN = (int) Lrequest.get("Token");
|
||||
Document accountServer;
|
||||
@ -236,6 +236,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();
|
||||
@ -250,6 +251,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
}
|
||||
} else {
|
||||
System.out.println("Banned Account");
|
||||
@ -264,6 +266,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");
|
||||
@ -279,10 +282,10 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
}
|
||||
}
|
||||
if (requesttype == 2) {
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
System.out.println("Login Request (USR&PASS)");
|
||||
String username = (String) Lrequest.get("User");
|
||||
String password = (String) Lrequest.get("Password");
|
||||
@ -342,7 +345,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);
|
||||
@ -356,7 +359,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
//delegationTimer.trigger();
|
||||
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
}
|
||||
} else {
|
||||
System.out.println("Banned Account");
|
||||
@ -371,7 +374,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();
|
||||
@ -386,12 +389,11 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
//delegationTimer.trigger();
|
||||
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
}
|
||||
|
||||
}
|
||||
if (requesttype == 3) {
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
System.out.println("Login Request (TKN)");
|
||||
int CTOKEN = (int) Lrequest.get("Token");
|
||||
// Document TResolve = dCollection.find(eq("type", 3)).first();
|
||||
@ -452,7 +454,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();
|
||||
@ -467,6 +469,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
|
||||
}
|
||||
} else {
|
||||
@ -482,6 +485,7 @@ public class delegationServices {
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
|
||||
}
|
||||
} catch (MongoCommandException ERC) {
|
||||
@ -497,13 +501,12 @@ public class delegationServices {
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
//delegationTimer.trigger();
|
||||
}
|
||||
}
|
||||
if (requesttype == 18) {
|
||||
//TOKEN LOGIN FOR GAME, DOES NOT SEND EMAIL, LAUNCHER WILL NOT USE THIS.
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
System.out.println("Login Request (TKN)");
|
||||
int CTOKEN = (int) Lrequest.get("Token");
|
||||
Document accountServer;
|
||||
@ -565,7 +568,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();
|
||||
@ -580,6 +583,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
//delegationTimer.trigger();
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
|
||||
}
|
||||
} else {
|
||||
@ -595,7 +599,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");
|
||||
@ -610,7 +614,7 @@ public class delegationServices {
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
//delegationTimer.trigger();
|
||||
}
|
||||
}
|
||||
@ -643,6 +647,7 @@ public class delegationServices {
|
||||
new BasicDBObject().append("status", true));
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
} catch (Exception exr) {
|
||||
System.out.println("Username Is Open");
|
||||
try {
|
||||
@ -692,7 +697,7 @@ public class delegationServices {
|
||||
dCollection.updateOne(searchQuery, updateQuery);
|
||||
dCollection.updateOne(searchQuery, updateQuery1);
|
||||
System.out.println("Update Request With Finished Status");
|
||||
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user