Skip to content

Backup and Logger Fixes #5077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JRoy merged 2 commits into from
Aug 18, 2022
Merged

Backup and Logger Fixes #5077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e82e32c
Fix null log messages causing an NPE
JRoy Aug 18, 2022
ae86474
Improve error messages in Backup
JRoy Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/Backup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ public void run() {
} while (line != null);
}
} catch (final IOException ex) {
ess.getLogger().log(Level.SEVERE, null, ex);
ess.getLogger().log(Level.SEVERE, "An error occurred while reading backup child process", ex);
}
});
child.waitFor();
} catch (final InterruptedException | IOException ex) {
ess.getLogger().log(Level.SEVERE, null, ex);
ess.getLogger().log(Level.SEVERE, "An error occurred while building the backup child process", ex);
} finally {
class BackupEnableSaveTask implements Runnable {
@Override
Expand Down
6 changes: 6 additions & 0 deletions providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperLoggerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public PaperLoggerProvider(final Plugin plugin) {

@Override
protected void doTheLog(Level level, String message, Throwable throwable) {
if (message == null) {
return;
}
final Component component = LegacyComponentSerializer.legacySection().deserialize(message);
if (level == Level.SEVERE) {
logger.error(component, throwable);
Expand All @@ -34,6 +37,9 @@ protected void doTheLog(Level level, String message, Throwable throwable) {

@Override
protected void doTheLog(Level level, String message) {
if (message == null) {
return;
}
final Component component = LegacyComponentSerializer.legacySection().deserialize(message);
if (level == Level.SEVERE) {
logger.error(component);
Expand Down