External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

connection: improved error processing and stability in connect dialog

Browse source
This commit is contained in:
Oleg Agafonov 2023-11-30 21:52:47 +04:00
parent adf57a0677
commit 0b0e947741
6 changed files with 55 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage.Common/src/main/java/mage/remote/SessionImpl.java
View file

@ -18,6 +18,7 @@ import mage.interfaces.callback.ClientCallback;
import mage.players.PlayerType;
import mage.players.net.UserData;
import mage.utils.CompressUtil;
import mage.utils.ThreadUtils;
import mage.view.*;
import org.apache.log4j.Logger;
import org.jboss.remoting.*;
@ -118,10 +119,13 @@ public class SessionImpl implements Session {
}
private void showMessageToUser(String message) {
if (message == null) {
message = "Unknown error, look at logs for details";
}
if (message.contains("free port for use")) {
message += " (try to close and restart a client app)";
}
client.showMessage("Remote task error. " + message);
client.showMessage("Remote task error: " + message);
}
private boolean doRemoteWorkAndHandleErrors(boolean closeConnectionOnFinish, boolean mustWaitServerMessageOnFail,
@ -180,17 +184,18 @@ public class SessionImpl implements Session {
logger.warn("Connect: wrong versions");
connectStop(false);
if (!canceled) {
showMessageToUser(ex.getMessage());
showMessageToUser(ex.toString());
}
} catch (CannotConnectException ex) {
if (!canceled) {
handleCannotConnectException(ex);
}
} catch (Throwable t) {
Throwable ex = ThreadUtils.findRootException(t);
logger.fatal("Connect: FAIL", t);
connectStop(false);
if (!canceled) {
showMessageToUser(t.getMessage());
showMessageToUser(ex.toString());
}
} finally {
lastRemotingTask = null;
@ -470,6 +475,8 @@ public class SessionImpl implements Session {
private void handleCannotConnectException(CannotConnectException ex) {
logger.warn("Cannot connect", ex);
// try to find a known error
Throwable t = ex.getCause();
String message = "";
while (t != null) {
@ -493,6 +500,7 @@ public class SessionImpl implements Session {
t = t.getCause();
}
client.showMessage("Unable connect to server. " + message);
setLastError(message);
if (logger.isTraceEnabled()) {
logger.trace("StackTrace", t);
}

8
Mage.Common/src/main/java/mage/utils/ThreadUtils.java
View file

@ -1,5 +1,7 @@
package mage.utils;
import com.google.common.base.Throwables;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@ -31,7 +33,7 @@ public final class ThreadUtils {
* Find real exception object after thread task completed. Can be used in afterExecute
*
*/
public static Throwable findRealException(Runnable r, Throwable t) {
public static Throwable findRunnableException(Runnable r, Throwable t) {
// executer.submit - return exception in result
// executer.execute - return exception in t
if (t == null && r instanceof Future<?>) {
@ -47,4 +49,8 @@ public final class ThreadUtils {
}
return t;
}
public static Throwable findRootException(Throwable t) {
return Throwables.getRootCause(t);
}
}