Archiviert
13
0

Just report HTTP errors, no need to make tickets out of them.

Dieser Commit ist enthalten in:
Kristian S. Stangeland 2013-01-13 18:00:34 +01:00
Ursprung 429ca5d447
Commit 1880add7dc

Datei anzeigen

@ -17,6 +17,8 @@
package com.comphenix.protocol;
import java.io.IOException;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.plugin.Plugin;
@ -74,7 +76,11 @@ class CommandProtocol extends CommandBase {
UpdateResult result = updater.update(UpdateType.NO_DOWNLOAD, true);
sender.sendMessage(ChatColor.BLUE + "[ProtocolLib] " + result.toString());
} catch (Exception e) {
getReporter().reportDetailed(this, "Cannot check updates for ProtocolLib.", e, sender);
if (isHttpError(e)) {
getReporter().reportWarning(this, "Http error: " + e.getCause().getMessage());
} else {
getReporter().reportDetailed(this, "Cannot check updates for ProtocolLib.", e, sender);
}
}
}
}, 0L);
@ -91,7 +97,11 @@ class CommandProtocol extends CommandBase {
UpdateResult result = updater.update(UpdateType.DEFAULT, true);
sender.sendMessage(ChatColor.BLUE + "[ProtocolLib] " + result.toString());
} catch (Exception e) {
getReporter().reportDetailed(this, "Cannot update ProtocolLib.", e, sender);
if (isHttpError(e)) {
getReporter().reportWarning(this, "Http error: " + e.getCause().getMessage());
} else {
getReporter().reportDetailed(this, "Cannot update ProtocolLib.", e, sender);
}
}
}
}, 0L);
@ -99,6 +109,17 @@ class CommandProtocol extends CommandBase {
updateFinished();
}
private boolean isHttpError(Exception e) {
Throwable cause = e.getCause();
if (cause instanceof IOException) {
// Thanks for making the message a part of the API ...
return cause.getMessage().contains("HTTP response");
} else {
return false;
}
}
/**
* Prevent further automatic updates until the next delay.
*/