2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-20 13:30:27 -07:00
Code Issues Projects Releases Packages Wiki Activity

more specific debugging for login hang

Browse source
This commit is contained in:
ryannathans 2022-03-13 14:18:09 +11:00 • committed by Ryan
parent 4bbda63ed2
commit 17ab7f5e92
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Server/src/main/java/core/game/node/entity/player/Player.java
View file

@ -398,7 +398,6 @@ public class Player extends Entity {
@Override @Override
public void init() { public void init() {
SystemLogger.logInfo(getUsername() + " initialising...");
if (!artificial) { if (!artificial) {
getProperties().setSpawnLocation(ServerConstants.HOME_LOCATION); getProperties().setSpawnLocation(ServerConstants.HOME_LOCATION);
getDetails().getSession().setObject(this); getDetails().getSession().setObject(this);

2
Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java
View file

@ -203,7 +203,6 @@ public final class LoginConfiguration {
* @param player the player. * @param player the player.
*/ */
public static final void config(final Player player) { public static final void config(final Player player) {
SystemLogger.logInfo("configuring player " + player.getUsername());
player.getInventory().refresh(); player.getInventory().refresh();
player.getEquipment().refresh(); player.getEquipment().refresh();
player.getSkills().refresh(); player.getSkills().refresh();
@ -222,7 +221,6 @@ public final class LoginConfiguration {
player.getInterfaceManager().close(); player.getInterfaceManager().close();
player.getEmoteManager().refresh(); player.getEmoteManager().refresh();
player.getInterfaceManager().openInfoBars(); player.getInterfaceManager().openInfoBars();
SystemLogger.logInfo("finished configuring player " + player.getUsername());
} }
/** /**

14
Server/src/main/kotlin/rs09/net/event/LoginReadEvent.kt
View file

@ -66,7 +66,6 @@ class LoginReadEvent
* @param buffer The buffer to read from. * @param buffer The buffer to read from.
*/ */
private fun decodeWorld(opcode: Int, session: IoSession, buffer: ByteBuffer) { private fun decodeWorld(opcode: Int, session: IoSession, buffer: ByteBuffer) {
SystemLogger.logInfo("decodeWorld")
var buffer = buffer var buffer = buffer
val d = buffer.get() // Memory? val d = buffer.get() // Memory?
val e = buffer.get() // no advertisement = 1 val e = buffer.get() // no advertisement = 1
@ -108,17 +107,26 @@ class LoginReadEvent
val b = buffer val b = buffer
SystemLogger.logInfo("spawning thread to handle login") SystemLogger.logInfo("spawning thread to handle login")
TaskExecutor.executeSQL { TaskExecutor.executeSQL {
SystemLogger.logInfo("login thread start")
Thread.currentThread().name = "Login Password Response" Thread.currentThread().name = "Login Password Response"
SystemLogger.logInfo("login thread named")
try { try {
val username = StringUtils.longToString(b.long) val username = StringUtils.longToString(b.long)
SystemLogger.logInfo("got username")
val password = ByteBufferUtils.getString(b) val password = ByteBufferUtils.getString(b)
SystemLogger.logInfo("got password")
val response = PlayerSQLManager.getCredentialResponse(username, password) val response = PlayerSQLManager.getCredentialResponse(username, password)
SystemLogger.logInfo("got sql response")
if (response != Response.SUCCESSFUL) { if (response != Response.SUCCESSFUL) {
SystemLogger.logInfo("not success :(")
session.write(response, true) session.write(response, true)
return@executeSQL return@executeSQL
} }
SystemLogger.logInfo("great success, attempting login")
login(PlayerDetails(username, password), session, b, opcode) login(PlayerDetails(username, password), session, b, opcode)
SystemLogger.logInfo("done")
} catch (e: Exception) { } catch (e: Exception) {
SystemLogger.logInfo("big whoops")
e.printStackTrace() e.printStackTrace()
session.write(Response.COULD_NOT_LOGIN) session.write(Response.COULD_NOT_LOGIN)
} }
@ -128,8 +136,7 @@ class LoginReadEvent
/** /**
* Handles the login procedure after we check an acc is registered & certified. * Handles the login procedure after we check an acc is registered & certified.
* @param username the username. * @param details the player's details.
* @param password the password.
* @param session the session. * @param session the session.
* @param buffer the byte buffer. * @param buffer the byte buffer.
* @param opcode the opcode. * @param opcode the opcode.
@ -156,7 +163,6 @@ class LoginReadEvent
*/ */
@JvmStatic @JvmStatic
fun getISAACSeed(buffer: ByteBuffer): IntArray { fun getISAACSeed(buffer: ByteBuffer): IntArray {
SystemLogger.logInfo("getISAACSeed")
val seed = IntArray(4) val seed = IntArray(4)
for (i in 0..3) { for (i in 0..3) {
seed[i] = buffer.int seed[i] = buffer.int