From b7e7f1cdcba86f66ccbb234564415a74fb27f632 Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Mon, 24 Jun 2024 15:17:19 +0200 Subject: [PATCH] updated logging of requests --- pom.xml | 2 +- .../dl/ege/webapp/servlethelpers/Conversion.java | 11 +++++------ .../dl/ege/webapp/servlethelpers/Customization.java | 12 ++++++------ .../pl/psnc/dl/ege/webapp/servlethelpers/Info.java | 3 +-- .../dl/ege/webapp/servlethelpers/Validation.java | 3 ++- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 705e5e6..49bf7e0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pl.psnc.dl.ege ege-framework - 0.5.5 + 0.5.6 EGE Framework diff --git a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Conversion.java b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Conversion.java index e818c69..f4b965b 100644 --- a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Conversion.java +++ b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Conversion.java @@ -83,7 +83,6 @@ public class Conversion { * of possible conversions paths. */ public static void doGetHelper(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath() + " " + request.toString()); try { RequestResolver rr = new ConversionRequestResolver(request, Method.GET); @@ -102,8 +101,7 @@ public static void doGetHelper(HttpServletRequest request, HttpServletResponse r } printConversionPossibilities(response, rr, inpfo); } - - } catch (RequestResolvingException ex) { + } catch (RequestResolvingException ex) { if (ex.getStatus().equals( RequestResolvingException.Status.WRONG_METHOD)) { response.sendError(405, R_WRONG_METHOD); @@ -111,8 +109,9 @@ public static void doGetHelper(HttpServletRequest request, HttpServletResponse r throw new ServletException(ex); } } + LOGGER.debug("REQUEST: " + request.getRequestURL() + "; " + request.getMethod() + "; " + response.getStatus()); - } + } /* * Send in response xml data of possible conversions paths. @@ -239,13 +238,12 @@ protected static void printConversionPossibilities(HttpServletResponse response, public static void doPostHelper( HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath()); try { ConversionRequestResolver rr = new ConversionRequestResolver( request, Method.POST); List pathFrame = (List) rr.getData(); performConversion(response, rr, pathFrame); - } catch (RequestResolvingException ex) { + } catch (RequestResolvingException ex) { if (ex.getStatus().equals( RequestResolvingException.Status.BAD_REQUEST)) { response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -258,6 +256,7 @@ public static void doPostHelper( } catch (Exception ex) { throw new ServletException(ex); } + LOGGER.debug("REQUEST: " + request.getRequestURL() + "; " + request.getMethod() + "; " + response.getStatus()); } /* diff --git a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Customization.java b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Customization.java index 7bb7618..cf41282 100644 --- a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Customization.java +++ b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Customization.java @@ -40,14 +40,13 @@ public class Customization { public void doGetHelper( HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath() + " " + request.toString()); - try { + try { //resolve request and catch any errors RequestResolver rr = new CustomizationRequestResolver(request, Method.GET); //print available validation options printAvailableCustomizationSettings(response, rr); - } catch (RequestResolvingException ex) { + } catch (RequestResolvingException ex) { if (ex.getStatus().equals( RequestResolvingException.Status.WRONG_METHOD)) { //TODO : something with "wrong" method message (and others) @@ -56,6 +55,7 @@ public void doGetHelper( throw new ServletException(ex); } } + LOGGER.debug("REQUEST: " + request.getRequestURL() + "; " + request.getMethod() + "; " + response.getStatus()); } /* @@ -112,13 +112,12 @@ private void printAvailableCustomizationSettings(HttpServletResponse response, public void doPostHelper( HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath()); - try { + try { RequestResolver rr = new CustomizationRequestResolver(request, Method.POST); String[] cs = (String[]) rr.getData(); performCustomization(cs, rr, response); - } catch (RequestResolvingException ex) { + } catch (RequestResolvingException ex) { if (ex.getStatus().equals( RequestResolvingException.Status.BAD_REQUEST)) { response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -130,6 +129,7 @@ public void doPostHelper( } catch (Exception ex) { throw new ServletException(ex); } + LOGGER.debug("REQUEST: " + request.getRequestURL() + "; " + request.getMethod() + "; " + response.getStatus()); } /* diff --git a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Info.java b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Info.java index 9fcc582..dac8b4f 100644 --- a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Info.java +++ b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Info.java @@ -33,7 +33,6 @@ public class Info extends HttpServlet { public void doGetHelper(HttpServletRequest request, HttpServletResponse response, HttpServlet httpservlet) throws IOException, ServletException { - LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath() + " " + request.toString()); servlet = httpservlet; //String serverInfo = servlet.getServletContext().getServerInfo(); try { @@ -96,7 +95,7 @@ public void doGetHelper(HttpServletRequest request, HttpServletResponse response catch (IOException e) { e.printStackTrace(); } - + LOGGER.debug("REQUEST: " + request.getRequestURL() + "; " + request.getMethod() + "; " + response.getStatus()); } public synchronized String getVersion(HttpServletRequest request) { diff --git a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Validation.java b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Validation.java index b04b5f5..71f8f85 100644 --- a/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Validation.java +++ b/src/main/java/pl/psnc/dl/ege/webapp/servlethelpers/Validation.java @@ -40,7 +40,6 @@ public void doGetHelper(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - LOGGER.debug("REQUEST: " + request.getRequestURL() + " " + request.getContextPath() + " " + request.toString()); try { //resolve request and catch any errors RequestResolver rr = new ValidationRequestResolver(request, @@ -58,6 +57,8 @@ public void doGetHelper(HttpServletRequest request, throw new ServletException(ex); } } + LOGGER.debug("REQUEST: " + request.getRequestURL() + "; " + request.getMethod() + "; " + response.getStatus()); + }