From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 4 Feb 2018 11:36:45 +0000 (+0100)
Subject: Improve logging
X-Git-Tag: argeo-commons-2.1.71~25
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=bc570353abdcc80a9d369c8509c648507644955d

Improve logging
---

diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java
index bdf7134b8..b400bf43a 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java
@@ -215,16 +215,21 @@ public class OsgiBoot implements OsgiBootConstants {
 				}
 			}
 		} catch (BundleException e) {
+			final String ALREADY_INSTALLED = "is already installed";
 			String message = e.getMessage();
 			if ((message.contains("Bundle \"" + SYMBOLIC_NAME_OSGI_BOOT + "\"")
 					|| message.contains("Bundle \"" + SYMBOLIC_NAME_EQUINOX + "\""))
-					&& message.contains("is already installed")) {
+					&& message.contains(ALREADY_INSTALLED)) {
 				// silent, in order to avoid warnings: we know that both
 				// have already been installed...
 			} else {
-				OsgiBootUtils.warn("Could not install bundle from " + url + ": " + message);
+				if (message.contains(ALREADY_INSTALLED)) {
+					if (OsgiBootUtils.isDebug())
+						OsgiBootUtils.warn("Duplicate install from " + url + ": " + message);
+				} else
+					OsgiBootUtils.warn("Could not install bundle from " + url + ": " + message);
 			}
-			if (OsgiBootUtils.debug && !message.contains("is already installed"))
+			if (OsgiBootUtils.debug && !message.contains(ALREADY_INSTALLED))
 				e.printStackTrace();
 		}
 	}