s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve startup logging to help debug browser window issues like #193

Browse Source 
and
#773
This commit is contained in:
Tom Morris 2013-08-06 12:18:01 -04:00
parent e6c0571ebf
commit 9c04e189cc
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/com/google/refine/Refine.java
View File

@ -40,6 +40,7 @@ import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.BindException;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -115,6 +116,7 @@ public class Refine {
boolean headless = Configurations.getBoolean("refine.headless",false); boolean headless = Configurations.getBoolean("refine.headless",false);
if (headless) { if (headless) {
System.setProperty("java.awt.headless", "true"); System.setProperty("java.awt.headless", "true");
logger.info("Running in headless mode");
} else { } else {
try { try {
RefineClient client = new RefineClient(); RefineClient client = new RefineClient();
@ -195,7 +197,12 @@ class RefineServer extends Server {
} }
// start the server // start the server
this.start(); try {
this.start();
} catch (BindException e) {
logger.error("Failed to start server - is there another copy running already on this port/address?");
throw e;
}
configure(context); configure(context);
} }
@ -434,6 +441,8 @@ class RefineClient extends JFrame implements ActionListener {
private static final long serialVersionUID = 7886547342175227132L; private static final long serialVersionUID = 7886547342175227132L;
final static Logger logger = LoggerFactory.getLogger("refine-client");
public static boolean MACOSX = (System.getProperty("os.name").toLowerCase().startsWith("mac os x")); public static boolean MACOSX = (System.getProperty("os.name").toLowerCase().startsWith("mac os x"));
private URI uri; private URI uri;
@ -484,6 +493,9 @@ class RefineClient extends JFrame implements ActionListener {
} }
private void openBrowser() { private void openBrowser() {
if (!Desktop.isDesktopSupported()) {
logger.warn("Java Desktop class not supported on this platform. Please open %s in your browser",uri.toString());
}
try { try {
Desktop.getDesktop().browse(uri); Desktop.getDesktop().browse(uri);
} catch (IOException e) { } catch (IOException e) {