This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/master by this push:
new 1f37102 Improve logs
1f37102 is described below
commit 1f371029964a0545bc0bca83faa87674cc87a377
Author: remm <r...@apache.org>
AuthorDate: Thu Jan 16 17:18:26 2020 +0100
Improve logs
Add the total time taken [the examples need 0.4s for me on my hardware,
so if it's automagic on deployment it will quickly add up]. Add a log
INFO when processing an archive, since it might take a while as well.
---
src/main/java/org/apache/tomcat/jakartaee/Migration.java | 8 ++++++--
.../resources/org/apache/tomcat/jakartaee/LocalStrings.properties | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index bc7744b..044e0a1 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -71,6 +72,7 @@ public class Migration {
public boolean execute() throws IOException {
logger.log(Level.INFO, sm.getString("migration.execute",
source.getAbsolutePath(),
destination.getAbsolutePath()));
+ long t1 = System.nanoTime();
if (source.isDirectory()) {
if (destination.mkdirs()) {
migrateDirectory(source, destination);
@@ -86,7 +88,8 @@ public class Migration {
logger.log(Level.SEVERE, sm.getString("migration.mkdirError",
parentDestination.getAbsolutePath()));
}
}
- logger.log(Level.INFO, sm.getString("migration.done"));
+ logger.log(Level.INFO, sm.getString("migration.done"),
+ Long.valueOf(TimeUnit.MILLISECONDS.convert(System.nanoTime() -
t1, TimeUnit.NANOSECONDS)));
return true;
}
@@ -141,10 +144,11 @@ public class Migration {
private void migrateStream(String name, InputStream src, OutputStream
dest) throws IOException {
- logger.log(Level.FINE, sm.getString("migration.stream", name));
if (isArchive(name)) {
+ logger.log(Level.INFO, sm.getString("migration.archive", name));
migrateArchive(src, dest);
} else {
+ logger.log(Level.FINE, sm.getString("migration.stream", name));
for (Converter converter : converters) {
if (converter.accpets(name)) {
converter.convert(src, dest);
diff --git
a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
index b41be87..9310641 100644
--- a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
+++ b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
@@ -13,8 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+migration.archive=Migrating archive [{0}]
migration.cannotReadSource=Cannot read source location [{0}]
-migration.done=Migration done
+migration.done=Migration completed in [{0}] milliseconds
migration.entry=Migrating Jar entry [{0}]
migration.error=Error performing migration
migration.execute=Performing migration from source [{0}] to destination [{1}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
