Expose POP3 metrics through JMX. Fixes #33

Author: Rustam Aliyev

modules/pop3/src/main/java/com/elasticinbox/pop3/Activator.java

@@ -39,7 +39,6 @@
 import com.ecyrd.speed4j.log.Slf4jLog;
 import com.elasticinbox.config.Configurator;
 import com.elasticinbox.pop3.server.handler.MailboxHandlerFactory;
-import com.elasticinbox.pop3.utils.LoggingPeriodicalLog;
 
 public class Activator implements BundleActivator
 {
@@ -62,12 +61,12 @@ public void start(BundleContext context) throws Exception
 
 		// Setup performance logger for POP3
 		if(Configurator.isPerformanceCountersEnabled()) {
-			LoggingPeriodicalLog pLog = new LoggingPeriodicalLog();
+			PeriodicalLog pLog = new PeriodicalLog();
 			pLog.setName(SPEED4J_LOG_NAME);
 			pLog.setMode(PeriodicalLog.Mode.JMX_ONLY);
 			pLog.setMaxQueueSize(250000);
 			pLog.setPeriod(Configurator.getPerformanceCountersInterval());
-			pLog.setJmx("DELIVERY.success,DELIVERY.discard,DELIVERY.defer,DELIVERY.defer_failure,DELIVERY.reject_overQuota,DELIVERY.reject_nonExistent");
+			pLog.setJmx("AUTH.success,AUTH.fail");
 			pLog.setSlf4jLogname("com.elasticinbox.speed4j.pop3.PeriodicalLogger");
 			stopWatchFactory = StopWatchFactory.getInstance(pLog);
 		} else {

modules/pop3/src/main/java/com/elasticinbox/pop3/server/handler/AuthHandler.java

@@ -34,13 +34,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.ecyrd.speed4j.StopWatch;
 import com.elasticinbox.core.account.authenticator.AuthenticationException;
 import com.elasticinbox.core.account.authenticator.AuthenticatorFactory;
 import com.elasticinbox.core.account.authenticator.IAuthenticator;
 import com.elasticinbox.core.account.validator.IValidator;
 import com.elasticinbox.core.account.validator.ValidatorFactory;
 import com.elasticinbox.core.account.validator.IValidator.AccountStatus;
 import com.elasticinbox.core.model.Mailbox;
+import com.elasticinbox.pop3.Activator;
 
 /**
  * POP3 Authentication Handler (AUTH)
@@ -69,6 +71,8 @@ protected org.apache.james.protocols.pop3.mailbox.Mailbox auth(POP3Session sessi
 		logger.debug("POP3: Authenticating session {}, user {}, pass {}",
 				new Object[] { session.getSessionID(), username, password });
 
+		StopWatch stopWatch = Activator.getDefault().getStopWatch();
+
 		try {
 			// authenticate mailbox, if failed return null
 			AccountStatus status = validator.getAccountStatus(username);
@@ -81,12 +85,16 @@ protected org.apache.james.protocols.pop3.mailbox.Mailbox auth(POP3Session sessi
 			// authenticate user with password
 			mailbox = authenticator.authenticate(username, password);
 
+			stopWatch.stop("AUTH.success");
+
 			// return POP3 handler for mailbox
 			return backend.getMailboxHander(mailbox);
 		} catch (IllegalArgumentException iae) {
+			stopWatch.stop("AUTH.fail");
 			logger.debug("POP3 Authentication failed. Invalid username [{}]: {}", username, iae.getMessage());
 			return null;
 		} catch (AuthenticationException ae) {
+			stopWatch.stop("AUTH.fail");
 			logger.debug("POP3 Authentication failed. Invalid username [{}] or password [{}]", username, password);
 			return null;
 		}