sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve detection and handling on headless systems

Browse source
This commit is contained in:
Craig Raw 2022-10-25 08:34:31 +02:00
parent ab2c77695b
commit ed69a86529
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/sparrowwallet/sparrow/Interface.java
View file

@ -7,7 +7,15 @@ public enum Interface {
public static Interface get() { public static Interface get() {
if(currentInterface == null) { if(currentInterface == null) {
currentInterface = DESKTOP; if(java.awt.GraphicsEnvironment.isHeadless()) {
if("Monocle".equalsIgnoreCase(System.getProperty("glass.platform"))) {
currentInterface = TERMINAL;
} else {
throw new UnsupportedOperationException("Headless environment detected but Monocle platform not found");
}
} else {
currentInterface = DESKTOP;
}
} }
return currentInterface; return currentInterface;

20
src/main/java/com/sparrowwallet/sparrow/SparrowWallet.java
View file

@ -86,13 +86,21 @@ public class SparrowWallet {
SLF4JBridgeHandler.removeHandlersForRootLogger(); SLF4JBridgeHandler.removeHandlersForRootLogger();
SLF4JBridgeHandler.install(); SLF4JBridgeHandler.install();
if(args.terminal || java.awt.GraphicsEnvironment.isHeadless()) { if(args.terminal) {
Interface.set(Interface.TERMINAL); Interface.set(Interface.TERMINAL);
PlatformImpl.setTaskbarApplication(false); }
Drongo.removeRootLogAppender("STDOUT");
com.sun.javafx.application.LauncherImpl.launchApplication(SparrowTerminal.class, SparrowWalletPreloader.class, argv); try {
} else { if(Interface.get() == Interface.TERMINAL) {
com.sun.javafx.application.LauncherImpl.launchApplication(SparrowDesktop.class, SparrowWalletPreloader.class, argv); PlatformImpl.setTaskbarApplication(false);
Drongo.removeRootLogAppender("STDOUT");
com.sun.javafx.application.LauncherImpl.launchApplication(SparrowTerminal.class, SparrowWalletPreloader.class, argv);
} else {
com.sun.javafx.application.LauncherImpl.launchApplication(SparrowDesktop.class, SparrowWalletPreloader.class, argv);
}
} catch(UnsupportedOperationException e) {
getLogger().error("Unable to launch application", e);
System.out.println("Use Sparrow Server on a headless (no display) system");
} }
} }