will not send mail when debuggin

1 parent 638b114b
......@@ -18,20 +18,20 @@ import javax.mail.internet.MimeMessage.RecipientType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
import fi.insomnia.bortal.util.MailMessage;
/**
* Message-Driven Bean implementation class for: MailMessageBean
*
*/
@MessageDriven(
activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") },
mappedName = "jms/mailque")
@MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") }, mappedName = "jms/mailque")
public class MailMessageBean implements MessageListener {
@Resource(name = "mail/lanbortal")
private Session mailSession;
private static final Logger logger = LoggerFactory.getLogger(MailMessageBean.class);
private static final Logger logger = LoggerFactory
.getLogger(MailMessageBean.class);
/**
* Default constructor.
......@@ -50,19 +50,35 @@ public class MailMessageBean implements MessageListener {
try {
mailmsg = (MailMessage) ((ObjectMessage) message).getObject();
logger.debug("Got message {}", mailmsg.getToName());
if (BortalLocalContextHolder.isInDevelopmentMode()) {
String dmessage = " To: "
+ mailmsg.getTo() + "\n Subject: "
+ mailmsg.getSubject() + "\n Text: "
+ mailmsg.getMessage() + "\n";
logger.debug("Not sendet mail (debug -mode): {}", dmessage);
} else {
MimeMessage msg = new MimeMessage(mailSession);
msg.setSubject(mailmsg.getSubject());
msg.setFrom(mailmsg.getFrom());
msg.setRecipient(RecipientType.TO, mailmsg.getTo());
msg.setText(mailmsg.getMessage(), mailmsg.getCharset());
Transport.send(msg);
}
} catch (JMSException e) {
logger.debug("Error receiving jms for {}", mailmsg, e);
} catch (MessagingException e) {
logger.debug("Unsupported encoding exception while sending mail to {}", mailmsg, e);
logger.debug(
"Unsupported encoding exception while sending mail to {}",
mailmsg, e);
} catch (UnsupportedEncodingException e) {
logger.debug("Unsupported encoding exception while sending mail to {}", mailmsg, e);
logger.debug(
"Unsupported encoding exception while sending mail to {}",
mailmsg, e);
}
}
......
......@@ -12,6 +12,8 @@ public class BortalLocalContextHolder {
private String hostname;
private final Map<IAppPermission, Boolean> rightcache = new HashMap<IAppPermission, Boolean>();
private static boolean inDevelopmentMode = false;
public BortalLocalContextHolder() {
}
......@@ -63,4 +65,16 @@ public class BortalLocalContextHolder {
return getThread();
}
public static boolean isInDevelopmentMode() {
return inDevelopmentMode;
}
public static void setInDevelopmentMode(boolean developmentMode) {
inDevelopmentMode = developmentMode;
}
}
\ No newline at end of file
......@@ -10,10 +10,10 @@
<ui:define name="content">
<h:outputText rendered="#{sessionHandler.isInDevelopmentMode()}">
<h:outputLabel rendered="#{sessionHandler.isInDevelopmentMode()}">
Development-tilassa.
Vaihda web.xml-tiedostosta ohjelman tila (javax.faces.PROJECT_STAGE) Productioniksi ennen kuin julkaiset ohjelman tuotantoon.
</h:outputText>
</h:outputLabel>
<h1>Insomnia lippukauppa</h1>
<h3>Lippujen hinnat</h3>
......
......@@ -26,7 +26,7 @@ public class HostnameFilter implements Filter {
private static final Logger logger = LoggerFactory
.getLogger(HostnameFilter.class);
private static boolean developmentMode = false;
private boolean developmentMode = false;
/**
* Default constructor.
......@@ -75,6 +75,7 @@ public class HostnameFilter implements Filter {
EventBeanLocal.HTTP_URL_HOSTNAME, hostname);
BortalLocalContextHolder.setHostname(hostname);
BortalLocalContextHolder.setInDevelopmentMode(developmentMode);
if (httpRequest.getUserPrincipal() == null) {
try {
......@@ -124,8 +125,5 @@ public class HostnameFilter implements Filter {
return ret;
}
public static boolean isDevelopmentMode() {
return developmentMode;
}
}
......@@ -21,6 +21,7 @@ import fi.insomnia.bortal.HostnameFilter;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.PermissionBeanLocal;
import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
import fi.insomnia.bortal.enums.apps.IAppPermission;
import fi.insomnia.bortal.model.User;
......@@ -155,6 +156,6 @@ public class SessionHandler {
}
public boolean isInDevelopmentMode() {
return HostnameFilter.isDevelopmentMode();
return BortalLocalContextHolder.isInDevelopmentMode();
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!