[pulsar] branch master updated: The log4j should be prefixed by pulsarRootDir (#2737)

[sa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sanjeevrk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 77e2e0b  The log4j should be prefixed by pulsarRootDir (#2737)
77e2e0b is described below

commit 77e2e0b2a1724928324a785a83c8e50b9a55c0f9
Author: Sanjeev Kulkarni <sa...@gmail.com>
AuthorDate: Fri Oct 5 18:03:33 2018 -0700

    The log4j should be prefixed by pulsarRootDir (#2737)
    
    * The log4j should be prefixed by pulsarRootDir
    
    * User importlib because use of __import__ is discouraged
---
 pulsar-functions/instance/src/main/python/util.py                    | 5 +++--
 .../java/org/apache/pulsar/functions/runtime/KubernetesRuntime.java  | 2 +-
 .../org/apache/pulsar/functions/runtime/KubernetesRuntimeTest.java   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pulsar-functions/instance/src/main/python/util.py b/pulsar-functions/instance/src/main/python/util.py
index c9337d9..4736457 100644
--- a/pulsar-functions/instance/src/main/python/util.py
+++ b/pulsar-functions/instance/src/main/python/util.py
@@ -25,6 +25,7 @@
 import os
 import inspect
 import sys
+import importlib
 
 import log
 
@@ -52,7 +53,7 @@ def import_class_from_path(from_path, full_class_name):
     sys.path.insert(0, from_path)
   if not classname_path:
     try:
-      mod = __import__(class_name, level=-1)
+      mod = importlib.import_module(class_name)
       return mod
     except Exception as e:
       Log.info("Import failed class_name %s from path %s" % (class_name, from_path))
@@ -60,7 +61,7 @@ def import_class_from_path(from_path, full_class_name):
       return None
   else:
     try:
-      mod = __import__(classname_path, fromlist=[class_name], level=-1)
+      mod = importlib.import_module(classname_path)
       retval = getattr(mod, class_name)
       return retval
     except Exception as e:
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/KubernetesRuntime.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/KubernetesRuntime.java
index 631b910..7303d8f 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/KubernetesRuntime.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/KubernetesRuntime.java
@@ -119,7 +119,7 @@ class KubernetesRuntime implements Runtime {
         this.originalCodeFileName = pulsarRootDir + "/" + originalCodeFileName;
         this.pulsarAdminUrl = pulsarAdminUrl;
         this.processArgs = RuntimeUtils.composeArgs(instanceConfig, instanceFile, logDirectory, this.originalCodeFileName, pulsarServiceUrl, stateStorageServiceUrl,
-                authConfig, "$" + ENV_SHARD_ID, GRPC_PORT, -1l, "conf/log4j2.yaml", installUserCodeDependencies);
+                authConfig, "$" + ENV_SHARD_ID, GRPC_PORT, -1l, pulsarRootDir + "/conf/log4j2.yaml", installUserCodeDependencies);
         running = false;
         doChecks(instanceConfig.getFunctionDetails());
     }
diff --git a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/KubernetesRuntimeTest.java b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/KubernetesRuntimeTest.java
index 6d2fc23..4606e31 100644
--- a/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/KubernetesRuntimeTest.java
+++ b/pulsar-functions/runtime/src/test/java/org/apache/pulsar/functions/runtime/KubernetesRuntimeTest.java
@@ -124,7 +124,7 @@ public class KubernetesRuntimeTest {
         assertEquals(args.size(), 30);
         String expectedArgs = "java -cp " + javaInstanceJarFile
                 + " -Dpulsar.functions.java.instance.jar=" + javaInstanceJarFile
-                + " -Dlog4j.configurationFile=conf/log4j2.yaml "
+                + " -Dlog4j.configurationFile=/pulsar/conf/log4j2.yaml "
                 + "-Dpulsar.function.log.dir=" + logDirectory + "/" + FunctionDetailsUtils.getFullyQualifiedName(config.getFunctionDetails())
                 + " -Dpulsar.function.log.file=" + config.getFunctionDetails().getName() + "-$SHARD_ID"
                 + " org.apache.pulsar.functions.runtime.JavaInstanceMain"