Improve logging

Change-Id: Ie8f6edc422166056b2c51a08ddcc253b3229f83d
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java
index 17a7bf1262e9f632dcaa26db7454818eb916a6c3..0bc8e5777d48b269ffc36210eca9bc60ced89b54 100644 (file)
--- a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java
+++ b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModule.java
@@ -19,6 +19,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -26,6 +28,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  */
 public final class Ipv4ReachabilityTopologyBuilderModule extends org.opendaylight.controller.config.yang.bgp.topology.provider.AbstractIpv4ReachabilityTopologyBuilderModule
 {
+       private static final Logger LOG = LoggerFactory.getLogger(Ipv4ReachabilityTopologyBuilderModule.class);
 
        public Ipv4ReachabilityTopologyBuilderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
                super(identifier, dependencyResolver);
@@ -47,6 +50,7 @@ public final class Ipv4ReachabilityTopologyBuilderModule extends org.opendayligh
                final Ipv4ReachabilityTopologyBuilder b = new Ipv4ReachabilityTopologyBuilder(getDataProviderDependency(), getLocalRibDependency(), getTopologyId());
                final InstanceIdentifier<Tables> i = b.tableInstanceIdentifier(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
                final ListenerRegistration<DataChangeListener> r = getDataProviderDependency().registerDataChangeListener(i, b);
+               LOG.debug("Registered listener {} on {} (topology {})", b, i, b.getInstanceIdentifier());
 
                final class TopologyReferenceAutocloseable extends DefaultTopologyReference implements AutoCloseable {
                        public TopologyReferenceAutocloseable(final InstanceIdentifier<Topology> instanceIdentifier) {

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java
index c79949b1042e5813ec8b3712edd56086e587aae1..e0e7616346121cfd35d526e70b7b3c0a7f248941 100644 (file)
--- a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java
+++ b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModule.java
@@ -19,12 +19,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
  */
 public final class Ipv6ReachabilityTopologyBuilderModule extends org.opendaylight.controller.config.yang.bgp.topology.provider.AbstractIpv6ReachabilityTopologyBuilderModule
 {
+       private static final Logger LOG = LoggerFactory.getLogger(Ipv6ReachabilityTopologyBuilderModule.class);
 
        public Ipv6ReachabilityTopologyBuilderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
                super(identifier, dependencyResolver);
@@ -46,6 +49,7 @@ public final class Ipv6ReachabilityTopologyBuilderModule extends org.opendayligh
                final Ipv6ReachabilityTopologyBuilder b = new Ipv6ReachabilityTopologyBuilder(getDataProviderDependency(), getLocalRibDependency(), getTopologyId());
                final InstanceIdentifier<Tables> i = b.tableInstanceIdentifier(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class);
                final ListenerRegistration<DataChangeListener> r = getDataProviderDependency().registerDataChangeListener(i, b);
+               LOG.debug("Registered listener {} on {} (topology {})", b, i, b.getInstanceIdentifier());
 
                final class TopologyReferenceAutocloseable extends DefaultTopologyReference implements AutoCloseable {
                        public TopologyReferenceAutocloseable(final InstanceIdentifier<Topology> instanceIdentifier) {

diff --git a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java
index ed2ae7b6d5394b944c43074fa0bd46c8f4aa999f..8c66761364f0a1a8fbe2a6192bed50d266e02c8a 100644 (file)
--- a/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java
+++ b/bgp/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModule.java
@@ -19,6 +19,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -26,6 +28,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  */
 public final class LinkstateTopologyBuilderModule extends org.opendaylight.controller.config.yang.bgp.topology.provider.AbstractLinkstateTopologyBuilderModule
 {
+       private static final Logger LOG = LoggerFactory.getLogger(LinkstateTopologyBuilderModule.class);
 
        public LinkstateTopologyBuilderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
                super(identifier, dependencyResolver);
@@ -47,6 +50,7 @@ public final class LinkstateTopologyBuilderModule extends org.opendaylight.contr
                final LinkstateTopologyBuilder b = new LinkstateTopologyBuilder(getDataProviderDependency(), getLocalRibDependency(), getTopologyId());
                final InstanceIdentifier<Tables> i = b.tableInstanceIdentifier(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class);
                final ListenerRegistration<DataChangeListener> r = getDataProviderDependency().registerDataChangeListener(i, b);
+               LOG.debug("Registered listener {} on {} (topology {})", b, i, b.getInstanceIdentifier());
 
                final class TopologyReferenceAutocloseable extends DefaultTopologyReference implements AutoCloseable {
                        public TopologyReferenceAutocloseable(final InstanceIdentifier<Topology> instanceIdentifier) {

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
index c269e12144c6bb6d6266148bb229cc44f221c59a..103ead45269ca6060a57e89c5c3e2c9cb2829bfb 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
@@ -74,6 +74,7 @@ TopologyReference {
        @Override
        public final void onLocRIBChange(final DataModification<InstanceIdentifier<?>, DataObject> trans,
                        final DataChangeEvent<InstanceIdentifier<?>, DataObject> event) {
+               LOG.debug("Received data change {} event with transaction {}", event, trans);
 
                final Set<InstanceIdentifier<T>> ids = new HashSet<>();
                for (final InstanceIdentifier<?> i : event.getRemovedOperationalData()) {
@@ -104,7 +105,7 @@ TopologyReference {
                Futures.addCallback(JdkFutureAdapters.listenInPoolThread(trans.commit()), new FutureCallback<RpcResult<TransactionStatus>>() {
                        @Override
                        public void onSuccess(final RpcResult<TransactionStatus> result) {
-                               // Nothing to do
+                               LOG.trace("Change committed successfully");
                        }
 
                        @Override
@@ -116,6 +117,7 @@ TopologyReference {
 
        @Override
        public final void close() throws InterruptedException, ExecutionException {
+               LOG.info("Shutting down builder for {}", getInstanceIdentifier());
                final DataModificationTransaction trans = this.dataProvider.beginTransaction();
                trans.removeOperationalData(getInstanceIdentifier());
                trans.commit().get();

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilder.java
index 1570774b143543de4ae81d3a760b57f9b37d326f..49e1efc625b118b848a03148947fcac18f6557ca 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilder.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilder.java
@@ -11,8 +11,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.LinkstateRoute;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.object.type.LinkCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.object.type.link._case.LinkDescriptors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class UriBuilder {
+       private static final Logger LOG = LoggerFactory.getLogger(UriBuilder.class);
        private final StringBuilder sb;
 
        UriBuilder(final UriBuilder base, final String type) {
@@ -62,6 +65,8 @@ final class UriBuilder {
 
        @Override
        public final String toString() {
-               return sb.toString();
+               final String ret = sb.toString();
+               LOG.trace("New URI {}", ret);
+               return ret;
        }
 }