Merge "Bug 1894: Add LISP configuration options to etc/custom.properties in Karaf"

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / src / main / java / org / opendaylight / controller / remote / rpc / RemoteRpcProviderFactory.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java
index 61dc8183df662b8fc7d4545519661fe9412a253a..c82a72eaa56c82e40388b8fb612eed7b198dbae8 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java
@@ -8,16 +8,44 @@
 
 package org.opendaylight.controller.remote.rpc;
 
-
+import akka.actor.ActorSystem;
+import akka.osgi.BundleDelegatingClassLoader;
+import com.typesafe.config.Config;
 import org.opendaylight.controller.sal.core.api.Broker;
 import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry;
 import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RemoteRpcProviderFactory {
-    public static RemoteRpcProvider createInstance(final Broker broker, final BundleContext bundleContext){
+    private static final Logger LOG = LoggerFactory.getLogger(RemoteRpcProviderFactory.class);
+
+    public static RemoteRpcProvider createInstance(
+            final Broker broker, final BundleContext bundleContext, final RemoteRpcProviderConfig config){
+
       RemoteRpcProvider rpcProvider =
-          new RemoteRpcProvider(ActorSystemFactory.getInstance(), (RpcProvisionRegistry) broker);
-      broker.registerProvider(rpcProvider, bundleContext);
+          new RemoteRpcProvider(createActorSystem(bundleContext, config), (RpcProvisionRegistry) broker);
+
+      broker.registerProvider(rpcProvider);
       return rpcProvider;
     }
+
+    private static ActorSystem createActorSystem(BundleContext bundleContext, RemoteRpcProviderConfig config){
+
+        // Create an OSGi bundle classloader for actor system
+        BundleDelegatingClassLoader classLoader =
+                new BundleDelegatingClassLoader(bundleContext.getBundle(),
+                        Thread.currentThread().getContextClassLoader());
+
+        Config actorSystemConfig = config.get();
+        if(LOG.isDebugEnabled()) {
+            LOG.debug("Actor system configuration\n{}", actorSystemConfig.root().render());
+        }
+        if (config.isMetricCaptureEnabled()) {
+            LOG.info("Instrumentation is enabled in actor system {}. Metrics can be viewed in JMX console.",
+                    config.getActorSystemName());
+        }
+
+        return ActorSystem.create(config.getActorSystemName(), actorSystemConfig, classLoader);
+    }
 }