mirror of
https://github.com/sparrowwallet/sparrow.git
synced 2024-12-24 12:46:45 +00:00
improve detection and handling on headless systems
This commit is contained in:
parent
ab2c77695b
commit
ed69a86529
2 changed files with 23 additions and 7 deletions
|
@ -7,7 +7,15 @@ public enum Interface {
|
|||
|
||||
public static Interface get() {
|
||||
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;
|
||||
|
|
|
@ -86,13 +86,21 @@ public class SparrowWallet {
|
|||
SLF4JBridgeHandler.removeHandlersForRootLogger();
|
||||
SLF4JBridgeHandler.install();
|
||||
|
||||
if(args.terminal || java.awt.GraphicsEnvironment.isHeadless()) {
|
||||
if(args.terminal) {
|
||||
Interface.set(Interface.TERMINAL);
|
||||
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);
|
||||
}
|
||||
|
||||
try {
|
||||
if(Interface.get() == Interface.TERMINAL) {
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue