inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate t-router debug

Browse Source
This commit is contained in:
alandavis
2022-08-15 10:49:32 +01:00
parent f560047904
commit 24ba2fb12b
6 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
View File

@@ -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<LogEntry> 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;

2
engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java
View File

@@ -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)

4
engines/base/src/test/java/org/alfresco/transform/base/TransformControllerAllInOneTest.java
View File

@@ -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",

4
engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java
View File

@@ -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",

2
engines/base/src/test/java/org/alfresco/transform/base/fakes/AbstractFakeTransformEngine.java
View File

@@ -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()

21
model/src/main/java/org/alfresco/transform/common/TransformerDebug.java
View File

@@ -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,13 +108,19 @@ 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)
{
popTransformWithDebugForEnginesOrAtTopForRouter(reference, elapsedTime);
}
}
private void popTransformWithDebugForEnginesOrAtTopForRouter(String reference, long elapsedTime)
{
String message = getPaddedReference(reference) + "Finished in " + ms(elapsedTime);
if (isTopLevel(reference) || !isTRouter())
@@ -127,7 +133,6 @@ public class TransformerDebug
}
// We don't append the Finished message to ClientData as that would be too much
}
}
public void logOptions(TransformRequest request)
{
@@ -160,7 +165,7 @@ public class TransformerDebug
public void logOptions(String reference, Map<String, String> options)
{
if (logger.isDebugEnabled() && options != null && !options.isEmpty())
if (logger.isDebugEnabled() && !isTRouter && options != null && !options.isEmpty())
{
for (Map.Entry<String, String> option : options.entrySet())
{