KB66 Use a MessageLogger for logging.
Change-Id: Ice21e79d23725beb104a3dcf999f5e68960e9435
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/newsletter/NewsletterSubscriptionExpirer.java b/src/main/java/eu/mulk/mulkcms2/benki/newsletter/NewsletterSubscriptionExpirer.java
index a9dda9c..6bc54b8 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/newsletter/NewsletterSubscriptionExpirer.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/newsletter/NewsletterSubscriptionExpirer.java
@@ -1,16 +1,14 @@
package eu.mulk.mulkcms2.benki.newsletter;
+import eu.mulk.mulkcms2.common.logging.Messages;
import io.quarkus.scheduler.Scheduled;
import java.time.OffsetDateTime;
import javax.enterprise.context.Dependent;
import javax.transaction.Transactional;
-import org.jboss.logging.Logger;
@Dependent
public class NewsletterSubscriptionExpirer {
- private static final Logger log = Logger.getLogger(NewsletterUnsubscriber.class);
-
@Scheduled(every = "PT1H")
@Transactional
void run() {
@@ -18,7 +16,7 @@
NewsletterSubscription.delete(
"registrationKey IS NOT NULL AND startDate < ?1", OffsetDateTime.now().minusWeeks(1));
if (subscriptionsDeleted > 0) {
- log.infof("%d expired newsletter subscriptions deleted.", subscriptionsDeleted);
+ Messages.log.expiredSubscriptionsDeleted(subscriptionsDeleted);
}
}
}
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/newsletter/NewsletterUnsubscriber.java b/src/main/java/eu/mulk/mulkcms2/benki/newsletter/NewsletterUnsubscriber.java
index 89e292e..294127f 100644
--- a/src/main/java/eu/mulk/mulkcms2/benki/newsletter/NewsletterUnsubscriber.java
+++ b/src/main/java/eu/mulk/mulkcms2/benki/newsletter/NewsletterUnsubscriber.java
@@ -1,5 +1,6 @@
package eu.mulk.mulkcms2.benki.newsletter;
+import eu.mulk.mulkcms2.common.logging.Messages;
import io.quarkus.mailer.MailTemplate.MailTemplateInstance;
import io.quarkus.qute.CheckedTemplate;
import java.util.concurrent.ExecutionException;
@@ -11,13 +12,10 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mail.MailMessage;
-import org.jboss.logging.Logger;
@Dependent
public class NewsletterUnsubscriber implements Processor {
- private static final Logger log = Logger.getLogger(NewsletterUnsubscriber.class);
-
@CheckedTemplate
static class Templates {
public static native MailTemplateInstance unsubscribedMail();
@@ -31,7 +29,7 @@
for (var sender : mail.getFrom()) {
if (!(sender instanceof InternetAddress)) {
- log.warnf("Tried to unsubscribe, but not an InternetAddress: %s", sender);
+ Messages.log.unsubscribeBadInternetAddress(sender);
continue;
}
@@ -51,13 +49,12 @@
s.delete();
- log.infof("Unsubscribed: %s (#%d)", s.email, s.id);
+ Messages.log.unsubscribed(s.email, s.id);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
throw new RuntimeException(e);
}
},
- () ->
- log.warnf("Tried to unsubscribe, but no subscription found: %s", sender.toString()));
+ () -> Messages.log.unsubscribeSubscriptionNotFound(sender));
}
}
}