Merge pull request #317 from kwin/feature/FELIX-6704-improve-error-logging-in-configMgr

bosschaert · web-flow · commit 6bb228df5171 · 2024-05-16T09:53:18.000+01:00
FELIX-6704: Include config/factory PID in error message
diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
@@ -929,8 +929,10 @@ public void callPlugins( final Dictionary<String, Object> props, final ServiceRe
                 }
                 catch ( Throwable t )
                 {
-                    Log.logger.log( LogService.LOG_ERROR, "Unexpected problem calling configuration plugin {0}", new Object[]
-                            { pluginRef , t } );
+                    String effectivePid = (factoryPid == null) ? configPid : factoryPid;
+                    String effectivePidLabel = (factoryPid == null) ? "Configuration PID" : "Factory PID";
+                    Log.logger.log( LogService.LOG_ERROR, "Unexpected problem calling configuration plugin {0} for {1}: {2} ", new Object[]
+                            { pluginRef, effectivePidLabel, effectivePid, t } );
                 }
                 finally
                 {

Original file line number	Diff line number	Diff line change
`@@ -929,8 +929,10 @@ public void callPlugins( final Dictionary<String, Object> props, final ServiceRe`
`929`	`929`	`}`
`930`	`930`	`catch ( Throwable t )`
`931`	`931`	`{`
`932`		`- Log.logger.log( LogService.LOG_ERROR, "Unexpected problem calling configuration plugin {0}", new Object[]`
`933`		`- { pluginRef , t } );`
	`932`	`+ String effectivePid = (factoryPid == null) ? configPid : factoryPid;`
	`933`	`+ String effectivePidLabel = (factoryPid == null) ? "Configuration PID" : "Factory PID";`
	`934`	`+ Log.logger.log( LogService.LOG_ERROR, "Unexpected problem calling configuration plugin {0} for {1}: {2} ", new Object[]`
	`935`	`+ { pluginRef, effectivePidLabel, effectivePid, t } );`
`934`	`936`	`}`
`935`	`937`	`finally`
`936`	`938`	`{`