Browse Source

minor onejar edits

jrivard@gmail.com 6 years ago
parent
commit
37838a547c

+ 4 - 2
onejar/src/main/java/password/pwm/onejar/OnejarMain.java

@@ -33,6 +33,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Comparator;
@@ -129,7 +130,8 @@ public class OnejarMain
 
 
     static void output( final String output )
     static void output( final String output )
     {
     {
-        System.out.println( output );
+        final Instant now = Instant.now().truncatedTo( ChronoUnit.SECONDS );
+        System.out.println( now.toString() + ", OneJar, " + output );
     }
     }
 
 
     private void explodeWar( final OnejarConfig onejarConfig ) throws IOException
     private void explodeWar( final OnejarConfig onejarConfig ) throws IOException
@@ -162,7 +164,7 @@ public class OnejarMain
     {
     {
         if ( rootPath.toFile().exists() )
         if ( rootPath.toFile().exists() )
         {
         {
-            System.out.println( "purging work directory: " + rootPath );
+            out( "purging work directory: " + rootPath );
             Files.walk( rootPath, FileVisitOption.FOLLOW_LINKS )
             Files.walk( rootPath, FileVisitOption.FOLLOW_LINKS )
                     .sorted( Comparator.reverseOrder() )
                     .sorted( Comparator.reverseOrder() )
                     .map( Path::toFile )
                     .map( Path::toFile )

+ 3 - 0
onejar/src/main/java/password/pwm/onejar/TomcatOnejarRunner.java

@@ -164,6 +164,9 @@ public class TomcatOnejarRunner
         connector.setAttribute( "keyAlias", OnejarMain.KEYSTORE_ALIAS );
         connector.setAttribute( "keyAlias", OnejarMain.KEYSTORE_ALIAS );
         connector.setAttribute( "clientAuth", "false" );
         connector.setAttribute( "clientAuth", "false" );
 
 
+        out( "connector maxThreads=" + connector.getAttribute( "maxThreads" ) );
+        out( "connector maxConnections=" + connector.getAttribute( "maxConnections" ) );
+
         if ( tlsProperties != null )
         if ( tlsProperties != null )
         {
         {
             for ( final String key : tlsProperties.stringPropertyNames() )
             for ( final String key : tlsProperties.stringPropertyNames() )