beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rework launcher error handling

Browse source
This commit is contained in:
crschnick 2024-07-01 15:09:20 +00:00
parent e26240ac1f
commit f6a112510c
1 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
View file

@ -81,11 +81,11 @@ public class LauncherCommand implements Callable<Integer> {
}
private void checkStart() {
try {
var port = AppBeaconServer.get().getPort();
var client = BeaconClient.tryEstablishConnection(
port, BeaconClientInformation.Daemon.builder().build());
if (client.isPresent()) {
var port = AppBeaconServer.get().getPort();
var client = BeaconClient.tryEstablishConnection(
port, BeaconClientInformation.Daemon.builder().build());
if (client.isPresent()) {
try {
client.get()
.performRequest(DaemonFocusExchange.Request.builder()
.mode(getEffectiveMode())
@ -96,41 +96,41 @@ public class LauncherCommand implements Callable<Integer> {
.arguments(inputs)
.build());
}
if (OsType.getLocal().equals(OsType.MACOS)) {
Desktop.getDesktop().setOpenURIHandler(e -> {
try {
client.get()
.performRequest(DaemonOpenExchange.Request.builder()
.arguments(List.of(e.getURI().toString()))
.build());
} catch (Exception ex) {
ErrorEvent.fromThrowable(ex).expected().omit().handle();
}
});
ThreadHelper.sleep(1000);
}
TrackEvent.info("Another instance is already running on this port. Quitting ...");
OperationMode.halt(1);
} catch (Exception ex) {
var cli = XPipeInstallation.getLocalDefaultCliExecutable();
ErrorEvent.fromThrowable("Unable to connect to existing running daemon instance as it did not respond."
+ " Either try to kill the process xpiped manually or use the command \"" + cli
+ "\" daemon stop --force.", ex)
.term()
.expected()
.handle();
}
// Even in case we are unable to reach another beacon server
// there might be another instance running, for example
// starting up or listening on another port
if (!AppDataLock.lock()) {
TrackEvent.info(
"Data directory " + AppProperties.get().getDataDir().toString()
+ " is already locked. Is another instance running?");
OperationMode.halt(1);
if (OsType.getLocal().equals(OsType.MACOS)) {
Desktop.getDesktop().setOpenURIHandler(e -> {
try {
client.get()
.performRequest(DaemonOpenExchange.Request.builder()
.arguments(List.of(e.getURI().toString()))
.build());
} catch (Exception ex) {
ErrorEvent.fromThrowable(ex).expected().omit().handle();
}
});
ThreadHelper.sleep(1000);
}
} catch (Exception ex) {
var cli = XPipeInstallation.getLocalDefaultCliExecutable();
ErrorEvent.fromThrowable(ex)
.term()
.description("Unable to connect to existing running daemon instance as it did not respond."
+ " Either try to kill the process xpiped manually or use the command \"" + cli
+ "\" daemon stop --force.")
.handle();
TrackEvent.info("Another instance is already running on this port. Quitting ...");
OperationMode.halt(1);
}
// Even in case we are unable to reach another beacon server
// there might be another instance running, for example
// starting up or listening on another port
if (!AppDataLock.lock()) {
TrackEvent.info(
"Data directory " + AppProperties.get().getDataDir().toString()
+ " is already locked. Is another instance running?");
OperationMode.halt(1);
}
}