mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-04-26 03:18:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added proper error handling for publishing

Browse Source
This commit is contained in:
NovaFox161
2020-12-11 08:37:51 -06:00
committed by Nova Fox
parent adb991cea6
commit 98a9262f6e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/main/java/org/dreamexposure/discal/client/message/AnnouncementMessageFormatter.java
+10 -6
View File
@@ -343,9 +343,11 @@ public class AnnouncementMessageFormatter {
.flatMap(ignored -> DatabaseManager.deleteAnnouncement(a.getAnnouncementId().toString()))
.then(Mono.empty()))
.flatMap(chan -> {
if (a.isPublishable())
return Messages.sendMessage(men, em, chan).flatMap(Message::publish);
else
if (a.isPublishable()) {
return Messages.sendMessage(men, em, chan)
.flatMap(Message::publish)
.onErrorResume(e -> Mono.empty());
} else
return Messages.sendMessage(men, em, chan);
})
)).then();
@@ -366,9 +368,11 @@ public class AnnouncementMessageFormatter {
.flatMap(ignored -> DatabaseManager.deleteAnnouncement(a.getAnnouncementId().toString()))
.then(Mono.empty()))
.flatMap(chan -> {
if (a.isPublishable())
return Messages.sendMessage(men, em, chan).flatMap(Message::publish);
else
if (a.isPublishable()) {
return Messages.sendMessage(men, em, chan)
.flatMap(Message::publish)
.onErrorResume(e -> Mono.empty());
} else
return Messages.sendMessage(men, em, chan);
})
)).then();
server/src/main/java/org/dreamexposure/discal/server/DisCalServer.java
+1
View File
@@ -133,6 +133,7 @@ public class DisCalServer {
LogFeed.log(LogObject.forDebug("Migrations Successful", sm + " migrations applied!"));
} catch (final Exception e) {
LogFeed.log(LogObject.forException("Migrations failure", e, DisCalServer.class));
e.printStackTrace();
System.exit(2);
}
}