inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-07-31 17:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-3449 Pickup ch.qos.logback 1.2.3 and enhance logging

Browse Source
This commit is contained in:
Alan Davis
2018-04-20 11:57:44 +01:00
parent 8e9800bf78
commit 93ab9ad92f
7 changed files with 146 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
alfresco-docker-alfresco-pdf-renderer/pom.xml
View File

@@ -24,6 +24,35 @@
<version>${dependency.spring-boot.version}</version> <version>${dependency.spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

29
alfresco-docker-imagemagick/pom.xml
View File

@@ -24,6 +24,35 @@
<version>${dependency.spring-boot.version}</version> <version>${dependency.spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

29
alfresco-docker-libreoffice/pom.xml
View File

@@ -24,6 +24,35 @@
<version>${dependency.spring-boot.version}</version> <version>${dependency.spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

29
alfresco-transformer-base/pom.xml
View File

@@ -20,7 +20,36 @@
<version>${dependency.spring-boot.version}</version> <version>${dependency.spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${dependency.ch-qos-logback.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

41
alfresco-transformer-base/src/main/java/org/alfresco/transformer/base/LogEntry.java
View File

@@ -32,6 +32,8 @@ import java.util.Deque;
import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import static java.lang.Math.max;
/** /**
* Provides setter and getter methods to allow the current Thread to set various log properties and for these * Provides setter and getter methods to allow the current Thread to set various log properties and for these
* values to be retrieved. The {@link #complete()} method should be called at the end of a request to flush the * values to be retrieved. The {@link #complete()} method should be called at the end of a request to flush the
@@ -65,14 +67,14 @@ public class LogEntry
private int statusCode; private int statusCode;
private long durationStreamIn; private long durationStreamIn;
private long durationTransform; private long durationTransform = -1;
private long durationStreamOut; private long durationStreamOut = -1;
private long durationDelay; private long durationDelay = -1;
private String source; private String source;
private long sourceSize; private long sourceSize;
private String target; private String target;
private long targetSize; private long targetSize = -1;
private String options; private String options;
private String message; private String message;
@@ -165,7 +167,7 @@ public class LogEntry
private void addDelayInternal(Long testDelay) private void addDelayInternal(Long testDelay)
{ {
durationDelay = testDelay - System.currentTimeMillis() + start; long durationDelay = Math.max(testDelay - System.currentTimeMillis() + start, -1);
if (durationDelay > 0) if (durationDelay > 0)
{ {
try try
@@ -176,17 +178,22 @@ public class LogEntry
{ {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
this.durationDelay = durationDelay;
} }
else else
{ {
durationDelay = 0; this.durationDelay = -1;
} }
} }
public static void complete() public static void complete()
{ {
LogEntry logEntry = currentLogEntry.get(); LogEntry logEntry = currentLogEntry.get();
logEntry.durationStreamOut = System.currentTimeMillis() - logEntry.start - logEntry.durationStreamIn - logEntry.durationTransform - logEntry.durationDelay; if (logEntry.statusCode == 200)
{
logEntry.durationStreamOut = System.currentTimeMillis() - logEntry.start -
logEntry.durationStreamIn - max(logEntry.durationTransform, 0) - max(logEntry.durationDelay, 0);
}
currentLogEntry.remove(); currentLogEntry.remove();
if (AbstractTransformerController.logger != null && AbstractTransformerController.logger.isDebugEnabled()) if (AbstractTransformerController.logger != null && AbstractTransformerController.logger.isDebugEnabled())
@@ -212,11 +219,14 @@ public class LogEntry
public String getDuration() public String getDuration()
{ {
return time(durationStreamIn + durationTransform + durationDelay + durationStreamOut)+" ("+ return time(durationStreamIn + max(durationTransform, 0) + max(durationDelay, 0) + max(durationStreamOut, 0))+
time(durationStreamIn)+' '+ " ("+
time(durationTransform)+' '+ (time(durationStreamIn)+' '+
(durationDelay > 0 ? time(durationDelay)+' ' : "")+ time(durationTransform)+' '+
time(durationStreamOut)+")"; (durationDelay > 0
? time(durationDelay)+' '+(durationStreamOut < 0 ? "-" : time(durationStreamOut))
: time(durationStreamOut))).trim()+
")";
} }
public String getSource() public String getSource()
@@ -251,15 +261,15 @@ public class LogEntry
private String time(long ms) private String time(long ms)
{ {
return size(ms, "1 ms", return ms == -1 ? "" : size(ms, "1ms",
new String[] { "ms", "s", "min", "hr" }, new String[] { "ms", "s", "min", "hr" },
new long[] { 1000, 60*1000, 60*60*1000, Long.MAX_VALUE}); new long[] { 1000, 60*1000, 60*60*1000, Long.MAX_VALUE});
} }
private String size(long size) private String size(long size)
{ {
return size(size, "1 byte", return size == -1 ? "" : size(size, "1 byte",
new String[] { "bytes", "KB", "MB", "GB", "TB" }, new String[] { "bytes", " KB", " MB", " GB", " TB" },
new long[] { 1024, 1024*1024, 1024*1024*1024, 1024*1024*1024*1024, Long.MAX_VALUE }); new long[] { 1024, 1024*1024, 1024*1024*1024, 1024*1024*1024*1024, Long.MAX_VALUE });
} }
@@ -294,7 +304,6 @@ public class LogEntry
sb.append("."); sb.append(".");
sb.append(decimalPoint); sb.append(decimalPoint);
} }
sb.append(' ');
sb.append(unit); sb.append(unit);
return sb.toString(); return sb.toString();

6
alfresco-transformer-base/src/main/resources/application.properties
View File

@@ -3,5 +3,7 @@ spring.http.multipart.max-request-size=8192MB
server.port = 8090 server.port = 8090
#logging.level.org.alfresco.util.exec.RuntimeExec=debug #logging.level.org.alfresco.util.exec.RuntimeExec=debug
#logging.level.org.alfresco.transformer.LibreOfficeController=debug logging.level.org.alfresco.transformer.LibreOfficeController=debug
#logging.level.org.alfresco.transformer.JodConverterSharedInstance=debug logging.level.org.alfresco.transformer.JodConverterSharedInstance=debug
logging.level.org.alfresco.transformer.AlfrescoPdfRendererController=debug
logging.level.org.alfresco.transformer.ImageMagickController=debug

1
pom.xml
View File

@@ -21,6 +21,7 @@
<dependency.spring-boot.version>1.5.10.RELEASE</dependency.spring-boot.version> <dependency.spring-boot.version>1.5.10.RELEASE</dependency.spring-boot.version>
<dependency.alfresco-core.version>7.2</dependency.alfresco-core.version> <dependency.alfresco-core.version>7.2</dependency.alfresco-core.version>
<dependency.alfresco-jodconverter-core.version>3.0.1.1</dependency.alfresco-jodconverter-core.version> <dependency.alfresco-jodconverter-core.version>3.0.1.1</dependency.alfresco-jodconverter-core.version>
<dependency.ch-qos-logback.version>1.2.3</dependency.ch-qos-logback.version>
<env.project_version>${project.version}</env.project_version> <env.project_version>${project.version}</env.project_version>
</properties> </properties>