From 24ba2fb12b068db9790045870815a2bec0d46cca Mon Sep 17 00:00:00 2001 From: alandavis Date: Mon, 15 Aug 2022 10:49:32 +0100 Subject: [PATCH] Remove duplicate t-router debug --- .../transform/base/TransformController.java | 33 ++++++++-------- .../base/transform/TransformHandler.java | 2 +- .../base/TransformControllerAllInOneTest.java | 4 +- .../base/TransformControllerTest.java | 4 +- .../fakes/AbstractFakeTransformEngine.java | 2 +- .../transform/common/TransformerDebug.java | 39 +++++++++++-------- 6 files changed, 45 insertions(+), 39 deletions(-) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java index f700a0b0..f99af254 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java @@ -162,7 +162,7 @@ public class TransformController @ResponseBody public String version() { - return transformEngine.getTransformEngineName() + ' ' + coreVersion; + return getSimpleTransformEngineName() + ' ' + coreVersion; } /** @@ -171,8 +171,8 @@ public class TransformController @GetMapping(ENDPOINT_ROOT) public String test(Model model) { - model.addAttribute("title", transformEngine.getTransformEngineName() + " Test Page"); - model.addAttribute("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName())); + model.addAttribute("title", getSimpleTransformEngineName() + " Test Page"); + model.addAttribute("proxyPathPrefix", getPathPrefix()); TransformConfig transformConfig = ((TransformRegistry) transformRegistry).getTransformConfig(); transformConfig = setOrClearCoreVersion(transformConfig, 0); model.addAttribute("transformOptions", optionLister.getOptionNames(transformConfig.getTransformOptions())); @@ -185,8 +185,8 @@ public class TransformController @GetMapping(ENDPOINT_ERROR) public String error(Model model) { - model.addAttribute("title", transformEngine.getTransformEngineName() + " Error Page"); - model.addAttribute("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName())); + model.addAttribute("title", getSimpleTransformEngineName() + " Error Page"); + model.addAttribute("proxyPathPrefix", getPathPrefix()); return "error"; // display error.html } @@ -196,8 +196,8 @@ public class TransformController @GetMapping(ENDPOINT_LOG) String log(Model model) { - model.addAttribute("title", transformEngine.getTransformEngineName() + " Log Entries"); - model.addAttribute("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName())); + model.addAttribute("title", getSimpleTransformEngineName() + " Log Entries"); + model.addAttribute("proxyPathPrefix", getPathPrefix()); Collection log = LogEntry.getLog(); if (!log.isEmpty()) { @@ -206,21 +206,21 @@ public class TransformController return "log"; // display log.html } - private Object getPathPrefix(String transformEngineName) + private Object getPathPrefix() { String pathPrefix = ""; if (behindIngres) { - int i = transformEngineName.indexOf(' '); - if (i != -1) - { - transformEngineName = transformEngineName.substring(i + 1); - } - pathPrefix = "/" + transformEngineName.toLowerCase(); + pathPrefix = "/" + getSimpleTransformEngineName().toLowerCase(); } return pathPrefix; } + private String getSimpleTransformEngineName() + { + return transformEngine.getTransformEngineName().replaceFirst("^\\d+ ", ""); + } + /** * Kubernetes readiness probe. */ @@ -228,6 +228,7 @@ public class TransformController @ResponseBody public String ready(HttpServletRequest request) { + // An alternative without transforms might be: ((TransformRegistry)transformRegistry).isReadyForTransformRequests(); return getProbeTransform().doTransformOrNothing(request, false, transformHandler); } @@ -341,8 +342,8 @@ public class TransformController response.sendError(e.getStatus().value(), message); ModelAndView mav = new ModelAndView(); - mav.addObject("title", transformEngine.getTransformEngineName() + " Error Page"); - mav.addObject("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName())); + mav.addObject("title", getSimpleTransformEngineName() + " Error Page"); + mav.addObject("proxyPathPrefix", getPathPrefix()); mav.addObject("message", message); mav.setViewName("error"); // display error.html return mav; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java index ebc84ddf..703b208a 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java @@ -138,7 +138,7 @@ public class TransformHandler @Override protected long getSourceSize() { - return -1L; // Ignore for http requests as the Alfresco repo will have checked. + return sourceMultipartFile.getSize(); } protected void sendTransformResponse(TransformManagerImpl transformManager) diff --git a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerAllInOneTest.java b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerAllInOneTest.java index ccd86257..35a845db 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerAllInOneTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerAllInOneTest.java @@ -111,8 +111,8 @@ public class TransformControllerAllInOneTest assertEquals( "--------------------------------------------------------------------------------------------------------------------------------------------------------------\n" - + "Startup AllInOne\n" - + "Line 2 AllInOne\n" + + "Startup 0000 AllInOne\n" + + "Line 2 0000 AllInOne\n" + "Line 3\n" + "--------------------------------------------------------------------------------------------------------------------------------------------------------------\n" + "Starting application components... Done", diff --git a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java index 7716dd27..76db3a9b 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java @@ -150,8 +150,8 @@ public class TransformControllerTest assertEquals( "--------------------------------------------------------------------------------------------------------------------------------------------------------------\n" - + "Startup TwoCustomTransformers\n" - + "Line 2 TwoCustomTransformers\n" + + "Startup 0000 TwoCustomTransformers\n" + + "Line 2 0000 TwoCustomTransformers\n" + "Line 3\n" + "--------------------------------------------------------------------------------------------------------------------------------------------------------------\n" + "Starting application components... Done", diff --git a/engines/base/src/test/java/org/alfresco/transform/base/fakes/AbstractFakeTransformEngine.java b/engines/base/src/test/java/org/alfresco/transform/base/fakes/AbstractFakeTransformEngine.java index a277804f..d6e01261 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/fakes/AbstractFakeTransformEngine.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/fakes/AbstractFakeTransformEngine.java @@ -38,7 +38,7 @@ public abstract class AbstractFakeTransformEngine implements TransformEngine @Override public String getTransformEngineName() { String simpleClassName = getClass().getSimpleName(); - return simpleClassName.substring("FakeTransformEngineWith".length()); + return "0000 "+simpleClassName.substring("FakeTransformEngineWith".length()); } @Override public String getStartupMessage() diff --git a/model/src/main/java/org/alfresco/transform/common/TransformerDebug.java b/model/src/main/java/org/alfresco/transform/common/TransformerDebug.java index 6207927b..99cbec2d 100644 --- a/model/src/main/java/org/alfresco/transform/common/TransformerDebug.java +++ b/model/src/main/java/org/alfresco/transform/common/TransformerDebug.java @@ -46,9 +46,9 @@ public class TransformerDebug private static final String TIMEOUT = "timeout"; // For truncating long option values - private static int MAX_OPTION_VALUE = 60; - private static int MAX_OPTION_END_CHARS = 5; - private static String MAX_OPTION_DOTS = "..."; + private static final int MAX_OPTION_VALUE = 60; + private static final int MAX_OPTION_END_CHARS = 5; + private static final String MAX_OPTION_DOTS = "..."; private boolean isTRouter = false; @@ -90,7 +90,7 @@ public class TransformerDebug public void pushTransform(String reference, String sourceMimetype, String targetMimetype, long sourceSizeInBytes, String transformerName) { - if (logger.isDebugEnabled()) + if (logger.isDebugEnabled() && !isTRouter) { String message = getPaddedReference(reference) + getMimetypeExt(sourceMimetype) + @@ -108,27 +108,32 @@ public class TransformerDebug InternalContext internalContext = reply.getInternalContext(); String reference = TransformStack.getReference(internalContext); long elapsedTime = TransformStack.getElapsedTime(internalContext); - popTransform(reference, elapsedTime); + popTransformWithDebugForEnginesOrAtTopForRouter(reference, elapsedTime); } } public void popTransform(String reference, long elapsedTime) { - if (logger.isDebugEnabled()) + if (logger.isDebugEnabled() && !isTRouter) { - String message = getPaddedReference(reference) + "Finished in " + ms(elapsedTime); - if (isTopLevel(reference) || !isTRouter()) - { - logger.debug(message); - } - else - { - logger.trace(message); - } - // We don't append the Finished message to ClientData as that would be too much + popTransformWithDebugForEnginesOrAtTopForRouter(reference, elapsedTime); } } + private void popTransformWithDebugForEnginesOrAtTopForRouter(String reference, long elapsedTime) + { + String message = getPaddedReference(reference) + "Finished in " + ms(elapsedTime); + if (isTopLevel(reference) || !isTRouter()) + { + logger.debug(message); + } + else + { + logger.trace(message); + } + // We don't append the Finished message to ClientData as that would be too much + } + public void logOptions(TransformRequest request) { RepositoryClientData repositoryClientData = new RepositoryClientData(request.getClientData()); @@ -160,7 +165,7 @@ public class TransformerDebug public void logOptions(String reference, Map options) { - if (logger.isDebugEnabled() && options != null && !options.isEmpty()) + if (logger.isDebugEnabled() && !isTRouter && options != null && !options.isEmpty()) { for (Map.Entry option : options.entrySet()) {