mirror of https://github.com/apache/maven.git
[MNG-5023] Wrong calculation of Build Total time
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1074258 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
06642a9eb7
commit
5e4393cc5e
|
@ -19,10 +19,7 @@ package org.apache.maven.cli;
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.text.DateFormat;
|
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.TimeZone;
|
|
||||||
|
|
||||||
import org.apache.maven.execution.AbstractExecutionListener;
|
import org.apache.maven.execution.AbstractExecutionListener;
|
||||||
import org.apache.maven.execution.BuildFailure;
|
import org.apache.maven.execution.BuildFailure;
|
||||||
|
@ -71,22 +68,28 @@ public class ExecutionEventLogger
|
||||||
|
|
||||||
private static String getFormattedTime( long time )
|
private static String getFormattedTime( long time )
|
||||||
{
|
{
|
||||||
String pattern = "s.SSS's'";
|
// NOTE: DateFormat is not suitable to format timespans of 24h+
|
||||||
|
|
||||||
if ( time / 60000L > 0 )
|
long h = time / ( 60 * 60 * 1000 );
|
||||||
|
long m = ( time - h * 60 * 60 * 1000 ) / ( 60 * 1000 );
|
||||||
|
long s = ( time - h * 60 * 60 * 1000 - m * 60 * 1000 ) / 1000;
|
||||||
|
long ms = time % 1000;
|
||||||
|
|
||||||
|
String format;
|
||||||
|
if ( h > 0 )
|
||||||
{
|
{
|
||||||
pattern = "m:s" + pattern;
|
format = "%1$d:%2$02d:%3$02d.%4$03ds";
|
||||||
|
}
|
||||||
if ( time / 3600000L > 0 )
|
else if ( m > 0 )
|
||||||
{
|
{
|
||||||
pattern = "H:m" + pattern;
|
format = "%2$d:%3$02d.%4$03ds";
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
format = "%3$d.%4$03ds";
|
||||||
}
|
}
|
||||||
|
|
||||||
DateFormat fmt = new SimpleDateFormat( pattern );
|
return String.format( format, h, m, s, ms );
|
||||||
fmt.setTimeZone( TimeZone.getTimeZone( "UTC" ) );
|
|
||||||
|
|
||||||
return fmt.format( new Date( time ) );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue