Martin Peřina has uploaded a new change for review. Change subject: core: Replace log4j with slf4j in services ......................................................................
core: Replace log4j with slf4j in services Replaces log4j with slf4j in services module. Change-Id: I380f76268b4e69868668fcac987c703fbeaed386 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/services/pom.xml M backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java M backend/manager/modules/services/src/main/resources/META-INF/MANIFEST.MF 3 files changed, 6 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/34180/1 diff --git a/backend/manager/modules/services/pom.xml b/backend/manager/modules/services/pom.xml index 12b1730..dfc179c 100644 --- a/backend/manager/modules/services/pom.xml +++ b/backend/manager/modules/services/pom.xml @@ -40,13 +40,6 @@ <version>${engine.version}</version> <scope>provided</scope> </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> </project> diff --git a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java index e39c82c..4c17e99 100644 --- a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java +++ b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java @@ -10,13 +10,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.log4j.Logger; - import org.ovirt.engine.core.utils.PKIResources; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PKIResourceServlet extends HttpServlet { - private static final Logger log = Logger.getLogger(PKIResourceServlet.class); + private static final Logger log = LoggerFactory.getLogger(PKIResourceServlet.class); private static Map<String, PKIResources.Resource> resources; private static Map<String, PKIResources.Format> formats; @@ -75,14 +75,8 @@ } } catch(Exception e) { - log.error( - String.format( - "Cannot send public key resource '%1$s' format '%2$s'", - resourceStr, - formatStr - ), - e - ); + log.error("Cannot send public key resource '{}' format '{}'", resourceStr, formatStr); + log.error("Exception", e); response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage()); } } diff --git a/backend/manager/modules/services/src/main/resources/META-INF/MANIFEST.MF b/backend/manager/modules/services/src/main/resources/META-INF/MANIFEST.MF index 6ac93cb..c20d3be 100644 --- a/backend/manager/modules/services/src/main/resources/META-INF/MANIFEST.MF +++ b/backend/manager/modules/services/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +1,2 @@ Manifest-Version: 1.0 -Dependencies: org.apache.log4j \ No newline at end of file +Dependencies: org.slf4j -- To view, visit http://gerrit.ovirt.org/34180 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I380f76268b4e69868668fcac987c703fbeaed386 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
