Alon Bar-Lev has uploaded a new change for review. Change subject: services: drop ovirt logger ......................................................................
services: drop ovirt logger Bug-Url: https://bugzilla.redhat.com/1109871 Change-Id: I8cb2bdf2bc0894b22e3ef320cc79fe193f31d8d7 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/GetSessionUser.java M backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/HealthStatus.java M backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java 3 files changed, 45 insertions(+), 52 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/34296/1 diff --git a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/GetSessionUser.java b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/GetSessionUser.java index e084a14..2cb5eda 100644 --- a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/GetSessionUser.java +++ b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/GetSessionUser.java @@ -16,8 +16,8 @@ import org.ovirt.engine.core.utils.ejb.BeanProxyType; import org.ovirt.engine.core.utils.ejb.BeanType; import org.ovirt.engine.core.utils.ejb.EjbUtils; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * This servlet gets a session ID, validates it, checks if the logged in user is administrator, and if so returns its user name @@ -29,7 +29,7 @@ private int SUCCESS_CODE = HttpURLConnection.HTTP_OK; private int FAILED_CODE = HttpURLConnection.HTTP_INTERNAL_ERROR; - private static final Log log = LogFactory.getLog(GetSessionUser.class); + private static final Logger log = LoggerFactory.getLogger(GetSessionUser.class); protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doProcessRequest(request, response); @@ -43,10 +43,10 @@ String sessionID = request.getParameter(SESSION_ID_PARAMETER); if (runQuery(request, response, sessionID)) { response.setStatus(SUCCESS_CODE); - log.debug("Validate Session " + sessionID + " succeeded"); + log.debug("Validate Session '{}' succeeded", sessionID); } else { response.setStatus(FAILED_CODE); - log.debug("Validate Session " + sessionID + " failed"); + log.debug("Validate Session '{}' failed", sessionID); } } @@ -75,7 +75,7 @@ log.debug("Getting user name"); printUPNToResponse(response, getUPN(user)); } else { - log.error("User is not authorized to perform operation"); + log.error("User '{}' is not authorized to perform operation", user.getLoginName()); returnValue = false; } } @@ -90,7 +90,8 @@ try { response.getWriter().print(upn); } catch (IOException e) { - log.error("IO Exception while writing user name: ", e); + log.error("Exception while writing user name: {}", e.getMessage()); + log.debug("Exception", e); } } diff --git a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/HealthStatus.java b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/HealthStatus.java index 52124f2..9e51043 100644 --- a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/HealthStatus.java +++ b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/HealthStatus.java @@ -13,11 +13,11 @@ import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.ejb.BeanProxyType; import org.ovirt.engine.core.utils.ejb.BeanType; import org.ovirt.engine.core.utils.ejb.EjbUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /*** * This class is a servlet implementation, aimed to report fundemental health of engine. @@ -31,7 +31,7 @@ */ public class HealthStatus extends HttpServlet { - private static final Log log = LogFactory.getLog(HealthStatus.class); + private static final Logger log = LoggerFactory.getLogger(HealthStatus.class); private boolean runQuery(HttpServletRequest request, PrintWriter out) { boolean fReturn = false; @@ -58,7 +58,7 @@ msg = "Unable to contact Backend!"; } out.print(msg); - log.error(msg + " Caught exception while trying to run query: ", t); + log.error(msg, t); fReturn = false; } diff --git a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java index c181a9d..a582aab 100644 --- a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java +++ b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java @@ -22,12 +22,12 @@ import org.ovirt.engine.core.utils.ejb.BeanProxyType; import org.ovirt.engine.core.utils.ejb.BeanType; import org.ovirt.engine.core.utils.ejb.EjbUtils; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RegisterServlet extends HttpServlet { - private static final Log log = LogFactory.getLog(RegisterServlet.class); + private static final Logger log = LoggerFactory.getLogger(RegisterServlet.class); private static final int SSH_PORT = 22; private static final int VDSM_PORT = 54321; @@ -36,11 +36,9 @@ protected void getVersionV1(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { log.info( - String.format( - "Version request: source='%s', secured='%s'", - request.getRemoteHost(), - request.isSecure() - ) + "Version request: source={}', secured='{}'", + request.getRemoteHost(), + request.isSecure() ); try (PrintWriter out = response.getWriter()) { @@ -52,11 +50,9 @@ protected void getPKITrustV1(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { log.info( - String.format( - "PKI Trust request: source='%s', secured='%s'", - request.getRemoteHost(), - request.isSecure() - ) + "PKI Trust request: source='{}', secured='{}'", + request.getRemoteHost(), + request.isSecure() ); try (PrintWriter out = response.getWriter()) { @@ -68,11 +64,9 @@ protected void getSSHTrustV1(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { log.info( - String.format( - "SSH Trust request: source='%s', secured='%s'", - request.getRemoteHost(), - request.isSecure() - ) + "SSH Trust request: source='{}', secured='{}'", + request.getRemoteHost(), + request.isSecure() ); try (PrintWriter out = response.getWriter()) { @@ -149,15 +143,13 @@ } log.info( - String.format( - "Registration request: source='%s', secured='%s', address='%s', vdsPort=%s, name='%s', uniqueId='%s'", - request.getRemoteHost(), - request.isSecure(), - hostAddress, - hostVdsPort, - hostName, - hostUniqueId - ) + "Registration request: source='{}', secured='{}', address='{}', vdsPort={}, name='{}', uniqueId='{}'", + request.getRemoteHost(), + request.isSecure(), + hostAddress, + hostVdsPort, + hostName, + hostUniqueId ); if (hostUniqueId != null) { @@ -208,18 +200,16 @@ } log.info( - String.format( - "Registration request: source='%s', secured='%s', address='%s%s:%s', sshKeyFingerprint=%s, vdsPort=%s, name='%s', uniqueId='%s'", - request.getRemoteHost(), - request.isSecure(), - hostSSHUser != null ? hostSSHUser + "@" : "", - hostAddress, - hostSSHPort, - hostSSHKeyFingerprint, - hostVdsPort, - hostName, - hostUniqueId - ) + "Registration request: source='{}', secured='{}', address='{}{}:{}', sshKeyFingerprint={}, vdsPort={}, name='{}', uniqueId='{}'", + request.getRemoteHost(), + request.isSecure(), + hostSSHUser != null ? hostSSHUser + "@" : "", + hostAddress, + hostSSHPort, + hostSSHKeyFingerprint, + hostVdsPort, + hostName, + hostUniqueId ); doRegister( @@ -243,7 +233,8 @@ registerV0(request, response); } catch (Exception e) { - log.error("Registration failed", e); + log.error("Registration failed: {}", e.getMessage()); + log.debug("Exception", e); response.sendError(response.SC_INTERNAL_SERVER_ERROR, e.getMessage()); } } @@ -269,7 +260,8 @@ } } catch (Exception e) { - log.error("Registration failed", e); + log.error("Registration failed: {}", e.getMessage()); + log.debug("Exception", e); response.sendError(response.SC_BAD_REQUEST, e.getMessage()); } } -- To view, visit http://gerrit.ovirt.org/34296 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8cb2bdf2bc0894b22e3ef320cc79fe193f31d8d7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
