AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed exception logging

Browse Source
This commit is contained in:
sergiorussia
2019-05-28 23:37:11 +03:00
parent 490420852e
commit b57524d0d6
30 changed files with 179 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launcher/src/main/java/com/threerings/getdown/launcher/AbortPanel.java
+1 -1
View File
@@ -72,7 +72,7 @@ public final class AbortPanel extends JFrame
public void actionPerformed (ActionEvent e)
{
String cmd = e.getActionCommand();
if (cmd.equals("ok")) {
if ("ok".equals(cmd)) {
System.exit(0);
} else {
setVisible(false);
launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
+46 -45
View File
@@ -22,7 +22,15 @@ import java.io.InputStreamReader;
import java.io.PrintStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.imageio.ImageIO;
import javax.swing.AbstractAction;
@@ -31,13 +39,24 @@ import javax.swing.JFrame;
import javax.swing.JLayeredPane;
import com.samskivert.swing.util.SwingUtil;
import com.threerings.getdown.data.*;
import com.threerings.getdown.data.Application;
import com.threerings.getdown.data.Application.UpdateInterface.Step;
import com.threerings.getdown.data.Build;
import com.threerings.getdown.data.EnvConfig;
import com.threerings.getdown.data.Resource;
import com.threerings.getdown.data.SysProps;
import com.threerings.getdown.net.Downloader;
import com.threerings.getdown.net.HTTPDownloader;
import com.threerings.getdown.tools.Patcher;
import com.threerings.getdown.util.*;
import com.threerings.getdown.util.Config;
import com.threerings.getdown.util.ConnectionUtil;
import com.threerings.getdown.util.FileUtil;
import com.threerings.getdown.util.LaunchUtil;
import com.threerings.getdown.util.MessageUtil;
import com.threerings.getdown.util.ProgressAggregator;
import com.threerings.getdown.util.ProgressObserver;
import com.threerings.getdown.util.StringUtil;
import com.threerings.getdown.util.VersionUtil;
import static com.threerings.getdown.Log.log;
/**
@@ -75,7 +94,7 @@ public abstract class Getdown extends Thread
// welcome to hell, where java can't cope with a classpath that contains jars that live
// in a directory that contains a !, at least the same bug happens on all platforms
String dir = envc.appDir.toString();
if (dir.equals(".")) {
if (".".equals(dir)) {
dir = System.getProperty("user.dir");
}
String errmsg = "The directory in which this application is installed:\n" + dir +
@@ -130,7 +149,7 @@ public abstract class Getdown extends Thread
File instdir = _app.getLocalPath("");
if (!instdir.canWrite()) {
String path = instdir.getPath();
if (path.equals(".")) {
if (".".equals(path)) {
path = System.getProperty("user.dir");
}
fail(MessageUtil.tcompose("m.readonly_error", path));
@@ -161,20 +180,7 @@ public abstract class Getdown extends Thread
} catch (Exception e) {
log.warning("run() failed.", e);
String msg = e.getMessage();
if (msg == null) {
msg = MessageUtil.compose("m.unknown_error", _ifc.installError);
} else if (!msg.startsWith("m.")) {
// try to do something sensible based on the type of error
if (e instanceof FileNotFoundException) {
msg = MessageUtil.compose(
"m.missing_resource", MessageUtil.taint(msg), _ifc.installError);
} else {
msg = MessageUtil.compose(
"m.init_error", MessageUtil.taint(msg), _ifc.installError);
}
}
fail(msg);
fail(e);
}
}
@@ -285,7 +291,7 @@ public abstract class Getdown extends Thread
// Store the config modtime before waiting the delay amount of time
long lastConfigModtime = config.lastModified();
log.info("Waiting " + _delay + " minutes before beginning actual work.");
Thread.sleep(_delay * 60 * 1000);
TimeUnit.MINUTES.sleep(_delay);
if (lastConfigModtime < config.lastModified()) {
log.warning("getdown.txt was modified while getdown was waiting.");
throw new MultipleGetdownRunning();
@@ -334,11 +340,7 @@ public abstract class Getdown extends Thread
if (toDownload.size() > 0) {
// we have resources to download, also note them as to-be-installed
for (Resource r : toDownload) {
if (!_toInstallResources.contains(r)) {
_toInstallResources.add(r);
}
}
_toInstallResources.addAll(toDownload);
try {
// if any of our resources have already been marked valid this is not a
@@ -423,22 +425,7 @@ public abstract class Getdown extends Thread
} catch (Exception e) {
log.warning("getdown() failed.", e);
String msg = e.getMessage();
if (msg == null) {
msg = MessageUtil.compose("m.unknown_error", _ifc.installError);
} else if (!msg.startsWith("m.")) {
// try to do something sensible based on the type of error
if (e instanceof FileNotFoundException) {
msg = MessageUtil.compose(
"m.missing_resource", MessageUtil.taint(msg), _ifc.installError);
} else {
msg = MessageUtil.compose(
"m.init_error", MessageUtil.taint(msg), _ifc.installError);
}
}
// Since we're dead, clear off the 'time remaining' label along with displaying the
// error message
fail(msg);
fail(e);
_app.releaseLock();
}
}
@@ -525,7 +512,7 @@ public abstract class Getdown extends Thread
// lastly regenerate the .jsa dump file that helps Java to start up faster
String vmpath = LaunchUtil.getJVMBinaryPath(javaLocalDir, false);
String[] command = new String[] { vmpath, "-Xshare:dump" };
String[] command = { vmpath, "-Xshare:dump" };
try {
log.info("Regenerating classes.jsa for " + vmpath + "...");
Runtime.getRuntime().exec(command);
@@ -732,7 +719,7 @@ public abstract class Getdown extends Thread
long minshow = _ifc.minShowSeconds * 1000L;
if (_container != null && uptime < minshow) {
try {
Thread.sleep(minshow - uptime);
TimeUnit.MILLISECONDS.sleep(minshow - uptime);
} catch (Exception e) {
}
}
@@ -848,8 +835,22 @@ public abstract class Getdown extends Thread
}
}
private void fail (Exception e) {
String msg = e.getMessage();
if (msg == null) {
msg = MessageUtil.compose("m.unknown_error", _ifc.installError);
} else if (!msg.startsWith("m.")) {
// try to do something sensible based on the type of error
msg = e instanceof FileNotFoundException
? MessageUtil.compose("m.missing_resource", MessageUtil.taint(msg), _ifc.installError)
: MessageUtil.compose("m.init_error", MessageUtil.taint(msg), _ifc.installError);
}
// Since we're dead, clear off the 'time remaining' label along with displaying the error message
fail(msg);
}
/**
* Update the status to indicate getdown has failed for the reason in <code>message</code>.
* Update the status to indicate getdown has failed for the reason in {@code message}.
*/
protected void fail (String message)
{
launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
+2 -2
View File
@@ -146,7 +146,7 @@ public class GetdownApp
}
if (_ifc.iconImages != null) {
ArrayList<Image> icons = new ArrayList<>();
List<Image> icons = new ArrayList<>();
for (String path : _ifc.iconImages) {
Image img = loadImage(path);
if (img == null) {
@@ -190,7 +190,7 @@ public class GetdownApp
String[] cmdarray;
if (LaunchUtil.isWindows()) {
String osName = System.getProperty("os.name", "");
if (osName.indexOf("9") != -1 || osName.indexOf("Me") != -1) {
if (osName.contains("9") || osName.contains("Me")) {
cmdarray = new String[] {
"command.com", "/c", "start", "\"" + url + "\"" };
} else {
launcher/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java
+1 -1
View File
@@ -131,7 +131,7 @@ public final class ProxyPanel extends JPanel implements ActionListener
public void actionPerformed (ActionEvent e)
{
String cmd = e.getActionCommand();
if (cmd.equals("ok")) {
if ("ok".equals(cmd)) {
String user = null, pass = null;
if (_useAuth.isSelected()) {
user = _username.getText();
launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java
+8 -10
View File
@@ -19,20 +19,18 @@ import java.net.URLConnection;
import java.util.Iterator;
import java.util.ServiceLoader;
import ca.beq.util.win32.registry.RegistryKey;
import ca.beq.util.win32.registry.RegistryValue;
import ca.beq.util.win32.registry.RootKey;
import com.threerings.getdown.data.Application;
import com.threerings.getdown.spi.ProxyAuth;
import com.threerings.getdown.util.Config;
import com.threerings.getdown.util.ConnectionUtil;
import com.threerings.getdown.util.LaunchUtil;
import com.threerings.getdown.util.StringUtil;
import ca.beq.util.win32.registry.RegistryKey;
import ca.beq.util.win32.registry.RegistryValue;
import ca.beq.util.win32.registry.RootKey;
import static com.threerings.getdown.Log.log;
public class ProxyUtil {
public final class ProxyUtil {
public static boolean autoDetectProxy (Application app)
{
@@ -57,12 +55,12 @@ public class ProxyUtil {
RegistryKey r = new RegistryKey(RootKey.HKEY_CURRENT_USER, PROXY_REGISTRY);
for (Iterator<?> iter = r.values(); iter.hasNext(); ) {
RegistryValue value = (RegistryValue)iter.next();
if (value.getName().equals("ProxyEnable")) {
enabled = value.getStringValue().equals("1");
if ("ProxyEnable".equals(value.getName())) {
enabled = "1".equals(value.getStringValue());
}
if (value.getName().equals("ProxyServer")) {
if ("ProxyServer".equals(value.getName())) {
String strval = value.getStringValue();
int cidx = strval.indexOf(":");
int cidx = strval.indexOf(':');
if (cidx != -1) {
rport = strval.substring(cidx+1);
strval = strval.substring(0, cidx);
launcher/src/main/java/com/threerings/getdown/launcher/RotatingBackgrounds.java
+2 -2
View File
@@ -14,7 +14,7 @@ public final class RotatingBackgrounds
{
public interface ImageLoader {
/** Loads and returns the image with the supplied path. */
public Image loadImage (String path);
Image loadImage (String path);
}
/**
@@ -35,7 +35,7 @@ public final class RotatingBackgrounds
}
/**
* Create a sequence of images to be rotated through from <code>backgrounds</code>.
* Create a sequence of images to be rotated through from {@code backgrounds}.
*
* Each String in backgrounds should be the path to the image, a semicolon, and the minimum
* amount of time to display the image in seconds. Each image will be active for an equal
launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java
+1 -4
View File
@@ -26,12 +26,9 @@ import com.samskivert.swing.Label;
import com.samskivert.swing.LabelStyleConstants;
import com.samskivert.swing.util.SwingUtil;
import com.samskivert.util.Throttle;
import com.threerings.getdown.data.Application.UpdateInterface;
import com.threerings.getdown.util.MessageUtil;
import com.threerings.getdown.util.Rectangle;
import com.threerings.getdown.util.StringUtil;
import static com.threerings.getdown.Log.log;
/**
@@ -344,7 +341,7 @@ public final class StatusPanel extends JComponent
{
String msg = get(key);
if (msg != null) return MessageFormat.format(MessageUtil.escape(msg), (Object[])args);
return key + String.valueOf(Arrays.asList(args));
return key + Arrays.asList(args);
}
/** Used by {@link #setStatus}, and {@link #setProgress}. */