Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-03 15:08:18 +01:00
Code Issues Projects Releases Wiki Activity

Add a more helpful error message for xmpp module (#3247)

Browse Source 
Rather than spitting out a stacktrace, this gives users some instructions on what to do.

It's a bit spammy so the error messages get noticed, that could be toned down a bit if we just want to be silent on login. Unfortunately a lot of plugins haven't discovered the debug and trace log levels, so a lot of startup warnings (like this one) will get lost in the spam if there aren't other issues.
This commit is contained in:
zml 2020-05-09 05:21:02 -07:00 committed by GitHub
parent 81d3900ef6
commit a043de3e44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Essentials/src/messages.properties
View File

@ -653,3 +653,4 @@ year=year
years=years years=years
youAreHealed=\u00a76You have been healed. youAreHealed=\u00a76You have been healed.
youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages\! Type \u00a7c/mail read\u00a76 to view your mail. youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages\! Type \u00a7c/mail read\u00a76 to view your mail.
xmppNotConfigured=XMPP is not configured properly. If you do not know what XMPP is, you may wish to remove the EssentialsXXMPP plugin from your server.

10
EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
View File

@ -16,6 +16,8 @@ import java.io.File;
import java.util.*; import java.util.*;
import java.util.logging.*; import java.util.logging.*;
import static com.earth2me.essentials.I18n.tl;
public class XMPPManager extends Handler implements MessageListener, ChatManagerListener, IConf { public class XMPPManager extends Handler implements MessageListener, ChatManagerListener, IConf {
private static final Logger logger = Logger.getLogger("EssentialsXMPP"); private static final Logger logger = Logger.getLogger("EssentialsXMPP");
@ -86,7 +88,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
private boolean connect() { private boolean connect() {
final String server = config.getString("xmpp.server"); final String server = config.getString("xmpp.server");
if (server == null || server.equals("example.com")) { if (server == null || server.equals("example.com")) {
logger.log(Level.WARNING, "config broken for xmpp"); logger.log(Level.WARNING, tl("xmppNotConfigured"));
return false; return false;
} }
final int port = config.getInt("xmpp.port", 5222); final int port = config.getInt("xmpp.port", 5222);
@ -128,10 +130,14 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
if (connection != null) { if (connection != null) {
connection.disconnect(new Presence(Presence.Type.unavailable)); connection.disconnect(new Presence(Presence.Type.unavailable));
} }
} }
final void updatePresence() { final void updatePresence() {
if (connection == null) {
parent.getEss().getLogger().warning(tl("xmppNotConfigured"));
return;
}
final int usercount; final int usercount;
final StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();