diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutableFlowBase.java b/azkaban-common/src/main/java/azkaban/executor/ExecutableFlowBase.java
index 97bbd5d..dc8fee1 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutableFlowBase.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutableFlowBase.java
@@ -27,6 +27,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ExecutableFlowBase extends ExecutableNode {
@@ -35,6 +37,7 @@ public class ExecutableFlowBase extends ExecutableNode {
public static final String PROPERTIES_PARAM = "properties";
public static final String SOURCE_PARAM = "source";
public static final String INHERITED_PARAM = "inherited";
+ private static final Logger logger = LoggerFactory.getLogger(ExecutableFlowBase.class);
private final HashMap<String, ExecutableNode> executableNodes =
new HashMap<>();
@@ -134,8 +137,7 @@ public class ExecutableFlowBase extends ExecutableNode {
final ExecutableNode targetNode = this.executableNodes.get(edge.getTargetId());
if (sourceNode == null) {
- System.out.println("Source node " + edge.getSourceId()
- + " doesn't exist");
+ logger.info("Source node " + edge.getSourceId() + " doesn't exist");
}
sourceNode.addOutNode(edge.getTargetId());
targetNode.addInNode(edge.getSourceId());
diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/event/LocalFlowWatcher.java b/azkaban-exec-server/src/main/java/azkaban/execapp/event/LocalFlowWatcher.java
index f90470a..2c9012c 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/event/LocalFlowWatcher.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/event/LocalFlowWatcher.java
@@ -69,7 +69,7 @@ public class LocalFlowWatcher extends FlowWatcher {
// A job runner is finished
final JobRunner runner = (JobRunner) event.getRunner();
final ExecutableNode node = runner.getNode();
- System.out.println(node + " looks like " + node.getStatus());
+ getLogger().info(node + " looks like " + node.getStatus());
handleJobStatusChange(node.getNestedId(), node.getStatus());
}
} else if (event.getType() == EventType.FLOW_FINISHED) {
diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
index 35369c0..50f26ad 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
@@ -662,12 +662,11 @@ public class AzkabanWebServer extends AzkabanServer {
log4jMBean.addLoggerMBean(AZKABAN_ACCESS_LOGGER_NAME);
if (accessLogLoggerObjName == null) {
- System.out
- .println(
- "************* loginLoggerObjName is null, make sure there is a logger with name "
- + AZKABAN_ACCESS_LOGGER_NAME);
+ logger.info(
+ "************* loginLoggerObjName is null, make sure there is a logger with name "
+ + AZKABAN_ACCESS_LOGGER_NAME);
} else {
- System.out.println("******** loginLoggerObjName: "
+ logger.info("******** loginLoggerObjName: "
+ accessLogLoggerObjName.getCanonicalName());
}
}
diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
index 38b03a1..764e32b 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
@@ -60,13 +60,13 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ExecutorServlet extends LoginAbstractAzkabanServlet {
- private static final Logger LOGGER =
- Logger.getLogger(ExecutorServlet.class.getName());
+ private static final Logger logger = LoggerFactory.getLogger(ExecutorServlet.class.getName());
private static final long serialVersionUID = 1L;
private WebMetrics webMetrics;
private ProjectManager projectManager;
@@ -389,14 +389,14 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
if (execExternalLinkURL.length() > 0) {
page.add("executionExternalLinkURL", execExternalLinkURL);
- LOGGER.debug("Added an External analyzer to the page");
- LOGGER.debug("External analyzer url: " + execExternalLinkURL);
+ logger.debug("Added an External analyzer to the page");
+ logger.debug("External analyzer url: " + execExternalLinkURL);
final String execExternalLinkLabel =
props.getString(Constants.ConfigurationKeys.AZKABAN_SERVER_EXTERNAL_ANALYZER_LABEL,
"External Analyzer");
page.add("executionExternalLinkLabel", execExternalLinkLabel);
- LOGGER.debug("External analyzer label set to : " + execExternalLinkLabel);
+ logger.debug("External analyzer label set to : " + execExternalLinkLabel);
}
page.add("projectId", project.getId());
@@ -839,7 +839,7 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
final HttpServletResponse resp, final HashMap<String, Object> ret, final User user,
final ExecutableFlow exFlow) throws ServletException {
final Long lastUpdateTime = Long.parseLong(getParam(req, "lastUpdateTime"));
- System.out.println("Fetching " + exFlow.getExecutionId());
+ logger.info("Fetching " + exFlow.getExecutionId());
final Project project =
getProjectAjaxByPermission(ret, exFlow.getProjectId(), user, Type.READ);
@@ -859,7 +859,7 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
private void ajaxFetchExecutableFlow(final HttpServletRequest req,
final HttpServletResponse resp, final HashMap<String, Object> ret, final User user,
final ExecutableFlow exFlow) throws ServletException {
- System.out.println("Fetching " + exFlow.getExecutionId());
+ logger.info("Fetching " + exFlow.getExecutionId());
final Project project =
getProjectAjaxByPermission(ret, exFlow.getProjectId(), user, Type.READ);