Skip to content

JavaMail log must be written when GeneXus debug is enabled #563

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
merged 2 commits into from
May 11, 2022
Merged

JavaMail log must be written when GeneXus debug is enabled #563

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
6d809f7
JavaMail log must be written when GeneXus debug is enabled
iroqueta May 6, 2022
53a0b8e
Merge branch 'master' into MailLog
iroqueta May 11, 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
30 changes: 5 additions & 25 deletions gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;

import com.genexus.diagnostics.core.ILogger;
import com.genexus.diagnostics.core.LogManager;
import jakarta.mail.Flags;
import jakarta.mail.Folder;
import jakarta.mail.Header;
Expand All @@ -31,9 +31,7 @@

public class POP3SessionJavaMail implements GXInternetConstants,IPOP3Session
{

static private boolean DEBUG = GXInternetConstants.DEBUG;
static private PrintStream logOutput;
public static final ILogger logger = LogManager.getLogger(POP3SessionJavaMail.class);

private String user;
private String password;
Expand All @@ -57,21 +55,6 @@ public class POP3SessionJavaMail implements GXInternetConstants,IPOP3Session
Message[] messages;
POP3Folder emailFolder;

static
{
if (DEBUG)
{
try
{
logOutput = new PrintStream(new FileOutputStream(new File("_gx_pop3.log"), true));
}
catch (IOException e)
{
System.out.println("Can't open POP3 log file pop3.log");
}
}
}

public POP3SessionJavaMail()
{
}
Expand Down Expand Up @@ -101,10 +84,9 @@ public void login(GXPOP3Session sessionInfo)
props.setProperty("mail.pop3.ssl.enable", String.valueOf(secureConnection));

session = Session.getInstance(props);
if (DEBUG)
if (logger.isDebugEnabled())
{
session.setDebug(true);
session.setDebugOut(logOutput);
}
try
{
Expand Down Expand Up @@ -407,8 +389,6 @@ public void setAttachmentsPath(String _attachmentsPath)

private void log(String text)
{
if (DEBUG)
if (logOutput != null)
logOutput.println(text);
logger.debug(text);
}
}
31 changes: 5 additions & 26 deletions gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
import jakarta.mail.internet.MimeMultipart;

import com.genexus.CommonUtil;
import com.genexus.diagnostics.core.ILogger;
import com.genexus.diagnostics.core.LogManager;

import jakarta.mail.internet.MimeBodyPart;
import jakarta.activation.*;

public final class SMTPSessionJavaMail implements GXInternetConstants,ISMTPSession
{
static private boolean DEBUG = GXInternetConstants.DEBUG;

static private PrintStream logOutput;
public static final ILogger logger = LogManager.getLogger(SMTPSessionJavaMail.class);

protected String host;
protected int port;
Expand All @@ -36,21 +36,6 @@ public final class SMTPSessionJavaMail implements GXInternetConstants,ISMTPSessi
private Session session;
private Transport t;
MimeMessage mailMessage;

static
{
if (DEBUG)
{
try
{
logOutput = new PrintStream(new FileOutputStream(new File("_gx_smtp.log"), true));
}
catch (IOException e)
{
System.out.println("Can't open SMTP log file smtp.log");
}
}
}

public SMTPSessionJavaMail()
{
Expand Down Expand Up @@ -96,10 +81,9 @@ public void login(GXSMTPSession sessionInfo, boolean useTLS)
props.setProperty("mail.smtp.user", user);
}
session = Session.getInstance(props);
if (DEBUG)
if (logger.isDebugEnabled())
{
session.setDebug(true);
session.setDebugOut(logOutput);
}
try
{
Expand Down Expand Up @@ -287,11 +271,6 @@ public void setAttachments(String attachments)

protected void log(String text)
{
if (DEBUG)
if (logOutput != null)
{
logOutput.println(text);
logOutput.flush();
}
logger.debug(text);
}
}