Author: fmeschbe
Date: Fri Mar 7 06:58:57 2008
New Revision: 634701
URL: http://svn.apache.org/viewvc?rev=634701&view=rev
Log:
Add more logging
Modified:
felix/trunk/configadmin/pom.xml
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java
Modified: felix/trunk/configadmin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/pom.xml?rev=634701&r1=634700&r2=634701&view=diff
==============================================================================
--- felix/trunk/configadmin/pom.xml (original)
+++ felix/trunk/configadmin/pom.xml Fri Mar 7 06:58:57 2008
@@ -62,12 +62,12 @@
${artifactId}
</Bundle-SymbolicName>
<Export-Package>
- org.apache.felix.cm,
- org.apache.felix.cm.file,
+ org.apache.felix.cm;
+ org.apache.felix.cm.file;version=1.0,
org.osgi.service.cm;version=1.2
</Export-Package>
<Private-Package>
- org.apache.felix.cm.*
+ org.apache.felix.cm.impl
</Private-Package>
<Bundle-Activator>
org.apache.felix.cm.impl.ConfigurationManager
Modified:
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java?rev=634701&r1=634700&r2=634701&view=diff
==============================================================================
---
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
(original)
+++
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
Fri Mar 7 06:58:57 2008
@@ -880,6 +880,11 @@
log( LogService.LOG_ERROR, sr + ": Unexpected problem updating
configuration", t );
}
}
+
+ public String toString()
+ {
+ return "ManagedService Update: pid=" + pid;
+ }
}
private class ManagedServiceFactoryUpdate implements Runnable
@@ -957,6 +962,7 @@
// Configuration has just been created but not yet updated
// we currently just ignore it and have the update
mechanism
// provide the configuration to the ManagedServiceFactory
+ log( LogService.LOG_DEBUG, "Ignoring new configuration
pid=" + pid, null );
continue;
}
else if ( !factoryPid.equals( cfg.getFactoryPid() ) )
@@ -992,6 +998,7 @@
// only, if there is non-null configuration data
if ( dictionary != null )
{
+ log( LogService.LOG_DEBUG, sr + ": Updating
configuration pid=" + pid, null );
service.updated( pid, dictionary );
}
}
@@ -1015,6 +1022,12 @@
}
}
}
+
+
+ public String toString()
+ {
+ return "ManagedServiceFactory Update: factoryPid=" + factoryPid;
+ }
}
private class UpdateConfiguration implements Runnable
@@ -1139,6 +1152,11 @@
fireConfigurationEvent( ConfigurationEvent.CM_UPDATED,
config.getPid(), config.getFactoryPid() );
}
+
+ public String toString()
+ {
+ return "Update: pid=" + config.getPid();
+ }
}
private class DeleteConfiguration implements Runnable
@@ -1219,6 +1237,11 @@
fireConfigurationEvent( ConfigurationEvent.CM_DELETED, pid,
factoryPid );
}
+
+ public String toString()
+ {
+ return "Delete: pid=" + pid;
+ }
}
private class FireConfigurationEvent implements Runnable
@@ -1261,6 +1284,11 @@
log( LogService.LOG_ERROR, "Unexpected problem delivery
configuration event to " + srs[i], t );
}
}
+ }
+
+ public String toString()
+ {
+ return "Fire ConfigurationEvent: pid=" + pid;
}
}
Modified:
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java?rev=634701&r1=634700&r2=634701&view=diff
==============================================================================
---
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java
(original)
+++
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java
Fri Mar 7 06:58:57 2008
@@ -86,6 +86,7 @@
// otherwise execute the task, log any issues
try
{
+ configurationManager.log( LogService.LOG_DEBUG, "Running task
" + task, null );
task.run();
}
catch ( Throwable t )
@@ -109,6 +110,8 @@
{
synchronized ( updateTasks )
{
+ configurationManager.log( LogService.LOG_DEBUG, "Scheduling task "
+ update, null );
+
// append to the task queue
updateTasks.add( update );
