Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-38988] Used java.util.logging.Logger instead of org.apache.l…
…og4j.Logger
  • Loading branch information
pjanouse committed Oct 14, 2016
1 parent 3918c6c commit 2c02c62
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 55 deletions.
6 changes: 3 additions & 3 deletions src/main/java/com/redhat/foreman/DisposableImpl.java
@@ -1,6 +1,6 @@
package com.redhat.foreman;

import org.apache.log4j.Logger;
import java.util.logging.Logger;
import org.jenkinsci.plugins.resourcedisposer.Disposable;

import javax.annotation.Nonnull;
Expand All @@ -12,7 +12,7 @@ public class DisposableImpl implements Disposable {

private final String cloudName;
private final String name;
private static final Logger LOGGER = Logger.getLogger(DisposableImpl.class);
private static final Logger LOGGER = Logger.getLogger(DisposableImpl.class.getName());

public DisposableImpl(String cloudName, String name) {
this.cloudName = cloudName;
Expand All @@ -27,7 +27,7 @@ public State dispose() throws Exception {
cloud.getForemanAPI().release(name);
return State.PURGED;
} else {
LOGGER.warn("Foreman Shared Node " + name + " is not part of a Foreman Shared Node Cloud");
LOGGER.warning("Foreman Shared Node " + name + " is not part of a Foreman Shared Node Cloud");
}
return State.TO_DISPOSE;
}
Expand Down
57 changes: 30 additions & 27 deletions src/main/java/com/redhat/foreman/ForemanAPI.java
Expand Up @@ -17,7 +17,9 @@
import javax.ws.rs.core.Response;

import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;

import java.util.logging.Level;
import java.util.logging.Logger;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
import org.glassfish.jersey.jackson.JacksonFeature;
Expand All @@ -31,7 +33,7 @@
*/
public class ForemanAPI {

private static final Logger LOGGER = Logger.getLogger(ForemanAPI.class);;
private static final Logger LOGGER = Logger.getLogger(ForemanAPI.class.getName());;

private static final String JENKINS_LABEL = "JENKINS_LABEL";
private static final String FOREMAN_HOSTS_PATH = "v2/hosts";
Expand Down Expand Up @@ -82,20 +84,21 @@ public JsonNode reserveHost(String hostname) {
WebTarget target = base.path(FOREMAN_RESERVE_PATH)
.queryParam(FOREMAN_QUERY_PARAM, FOREMAN_QUERY_NAME + hostname)
.queryParam(FOREMAN_RESERVE_REASON, getReserveReason());
LOGGER.debug(target.toString());
LOGGER.fine(target.toString());

Response response = getForemanResponse(target);

if (Response.Status.fromStatusCode(response.getStatus()) == Response.Status.OK) {
String responseAsString = response.readEntity(String.class);
LOGGER.debug(responseAsString);
LOGGER.finer(responseAsString);
try {
return new ObjectMapper().readValue(responseAsString, JsonNode.class);
} catch (Exception e) {
LOGGER.error("Unhandled exception reserving " + hostname + ".", e);
LOGGER.log(Level.SEVERE, "Unhandled exception reserving " + hostname + ".", e);
e.printStackTrace();
}
} else {
LOGGER.error("Attempt to reserve " + hostname + " returned code " + response.getStatus() + ".");
LOGGER.severe("Attempt to reserve " + hostname + " returned code " + response.getStatus() + ".");
}
return null;
}
Expand Down Expand Up @@ -128,13 +131,13 @@ public synchronized void release(String hostname) throws Exception {
LOGGER.info("Attempting to Release host " + hostname);
WebTarget target = base.path(FOREMAN_RELEASE_PATH)
.queryParam(FOREMAN_QUERY_PARAM, FOREMAN_QUERY_NAME + hostname);
LOGGER.debug(target.toString());
LOGGER.finer(target.toString());
Response response = getForemanResponse(target);

if (Response.Status.fromStatusCode(response.getStatus()) != Response.Status.OK) {
String responseAsString = response.readEntity(String.class);
LOGGER.debug(responseAsString);
LOGGER.error("Attempt to release " + hostname + " returned code " + response.getStatus() + ".");
LOGGER.finer(responseAsString);
LOGGER.severe("Attempt to release " + hostname + " returned code " + response.getStatus() + ".");
} else {
LOGGER.info("Host " + hostname + " successfully released.");
}
Expand All @@ -153,7 +156,7 @@ private Response getForemanResponse(WebTarget target) {
try {
response = target.request(MediaType.APPLICATION_JSON).get();
} catch (Exception e) {
LOGGER.error(e.getMessage());
LOGGER.severe(e.getMessage());
}
return response;
}
Expand All @@ -170,10 +173,10 @@ public String getVersion() throws Exception {

if (Response.Status.fromStatusCode(response.getStatus()) == Response.Status.OK) {
String responseAsString = response.readEntity(String.class);
LOGGER.debug(responseAsString);
LOGGER.finer(responseAsString);
ObjectMapper mapper = new ObjectMapper();
JsonNode param = mapper.readValue(responseAsString, JsonNode.class);
LOGGER.debug(param.toString());
LOGGER.finer(param.toString());
if ((param.get("version") != null)) {
return param.get("version").asText();
}
Expand All @@ -192,33 +195,33 @@ public String getVersion() throws Exception {
public String getHostParameterValue(String hostname, String parameterName) throws Exception {
String hostParamPath = FOREMAN_HOSTS_PATH + "/" + hostname + "/parameters/" + parameterName;
WebTarget target = base.path(hostParamPath);
LOGGER.debug(target.toString());
LOGGER.finer(target.toString());
Response response = getForemanResponse(target);

if (Response.Status.fromStatusCode(response.getStatus()) == Response.Status.OK) {
String responseAsString = response.readEntity(String.class);
LOGGER.debug(responseAsString);
LOGGER.finer(responseAsString);
try {
ObjectMapper mapper = new ObjectMapper();
JsonNode param = mapper.readValue(responseAsString, JsonNode.class);
LOGGER.debug(param.toString());
LOGGER.finer(param.toString());
if ((param.get("name") != null && param.get("name").textValue().equals(parameterName))) {
LOGGER.debug("Returning host parameter "
LOGGER.finer("Returning host parameter "
+ parameterName + "=" + param.get("value") + " for " + hostname);
return param.get("value").asText();
} else {
return null;
}
} catch (Exception e) {
LOGGER.error("Unhandled exception getting " + parameterName + " for " + hostname + ".", e);
LOGGER.log(Level.SEVERE, "Unhandled exception getting " + parameterName + " for " + hostname + ".", e);
e.printStackTrace();
throw e;
}
} else {
String err = "Retrieving " + parameterName + " for " + hostname
+ " returned code " + response.getStatus() + ".";
Exception e = new Exception(err);
LOGGER.error(err, e);
LOGGER.log(Level.SEVERE, err, e);
throw e;
}
}
Expand All @@ -244,25 +247,25 @@ public String getRemoteFSForSlave(String hostname) throws Exception {
public String getHostAttributeValue(String hostname, String attribute) {
String hostParamPath = FOREMAN_HOSTS_PATH + "/" + hostname;
WebTarget target = base.path(hostParamPath);
LOGGER.debug(target.toString());
LOGGER.finer(target.toString());
Response response = getForemanResponse(target);

if (Response.Status.fromStatusCode(response.getStatus()) == Response.Status.OK) {
String responseAsString = response.readEntity(String.class);
LOGGER.debug(responseAsString);
LOGGER.finer(responseAsString);
try {
ObjectMapper mapper = new ObjectMapper();
JsonNode param = mapper.readValue(responseAsString, JsonNode.class);
LOGGER.debug(param.toString());
LOGGER.debug(param.get(attribute));
LOGGER.finer(param.toString());
LOGGER.finer(param.get(attribute).toString());
LOGGER.info("Retrieving " + attribute + "=" + param.get(attribute) + " for " + hostname);
return param.get(attribute).asText();
} catch (Exception e) {
LOGGER.error("Unhandled exception getting " + attribute + " for " + hostname + ".", e);
LOGGER.log(Level.SEVERE, "Unhandled exception getting " + attribute + " for " + hostname + ".", e);
e.printStackTrace();
}
} else {
LOGGER.error("Retrieving " + attribute + " for " + hostname
LOGGER.severe("Retrieving " + attribute + " for " + hostname
+ " returned code " + response.getStatus() + ".");
}
return null;
Expand Down Expand Up @@ -290,12 +293,12 @@ public Map<String, String> getHostForQuery(String query) throws Exception {
.queryParam(FOREMAN_SEARCH_PARAM,
query);

LOGGER.debug(target.toString());
LOGGER.finer(target.toString());
Response response = getForemanResponse(target);

if (Response.Status.fromStatusCode(response.getStatus()) == Response.Status.OK) {
String responseAsString = response.readEntity(String.class);
LOGGER.debug(responseAsString);
LOGGER.finer(responseAsString);
try {
ObjectMapper mapper = new ObjectMapper();
JsonNode json = mapper.readValue(responseAsString, JsonNode.class);
Expand All @@ -306,7 +309,7 @@ public Map<String, String> getHostForQuery(String query) throws Exception {
}
}
} catch (Exception e) {
LOGGER.error("Unhandled exception getting compatible hosts: ", e);
LOGGER.log(Level.SEVERE, "Unhandled exception getting compatible hosts: ", e);
e.printStackTrace();
}
for (String host: hostsList) {
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/redhat/foreman/ForemanComputer.java
Expand Up @@ -2,7 +2,7 @@

import java.io.IOException;

import org.apache.log4j.Logger;
import java.util.logging.Logger;

import hudson.model.Computer;
import hudson.model.Executor;
Expand All @@ -17,7 +17,7 @@
*/
public class ForemanComputer extends AbstractCloudComputer<ForemanSharedNode> {

private static final Logger LOGGER = Logger.getLogger(ForemanComputer.class);
private static final Logger LOGGER = Logger.getLogger(ForemanComputer.class.getName());

@Override
public void taskCompleted(Executor executor, Task task, long durationMS) {
Expand Down Expand Up @@ -45,9 +45,9 @@ protected void kill() {
node.terminate();
}
} catch (InterruptedException e) {
LOGGER.warn("Error during ForemanComputer kill() - " + e.getMessage());
LOGGER.warning("Error during ForemanComputer kill() - " + e.getMessage());
} catch (IOException e) {
LOGGER.warn("Error during ForemanComputer kill() - " + e.getMessage());
LOGGER.warning("Error during ForemanComputer kill() - " + e.getMessage());
}
}

Expand Down Expand Up @@ -86,9 +86,9 @@ public void run() {
try {
ForemanComputer.terminateForemanComputer(owner);
} catch (InterruptedException e) {
LOGGER.warn(e.getMessage());
LOGGER.warning(e.getMessage());
} catch (IOException e) {
LOGGER.warn(e.getMessage());
LOGGER.warning(e.getMessage());
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/redhat/foreman/ForemanSharedNode.java
Expand Up @@ -16,7 +16,7 @@
import java.io.IOException;
import java.util.List;

import org.apache.log4j.Logger;
import java.util.logging.Logger;
import org.jenkinsci.plugins.resourcedisposer.AsyncResourceDisposer;

/**
Expand All @@ -32,7 +32,7 @@ public void terminate() throws InterruptedException, IOException {
super.terminate();
}

private static final Logger LOGGER = Logger.getLogger(ForemanSharedNode.class);
private static final Logger LOGGER = Logger.getLogger(ForemanSharedNode.class.getName());
private static final int NUM_EXECUTORS = 1;

private static final long serialVersionUID = -3284884519464420953L;
Expand Down

0 comments on commit 2c02c62

Please sign in to comment.