[Feature][1.5.0] Load user-defined log4j.properties (#5023)

* flink-log4j * code format
apache · Dec 8, 2023 · d16f6a3 · d16f6a3
1 parent 2f9f9bb
commit d16f6a3
Showing 1 changed file with 26 additions and 2 deletions.
diff --git a/.../scala/org/apache/linkis/engineconnplugin/flink/launch/FlinkEngineConnLaunchBuilder.scala b/.../scala/org/apache/linkis/engineconnplugin/flink/launch/FlinkEngineConnLaunchBuilder.scala
@@ -24,8 +24,19 @@ import org.apache.linkis.hadoop.common.conf.HadoopConf
 import org.apache.linkis.manager.common.protocol.bml.BmlResource
 import org.apache.linkis.manager.engineplugin.common.conf.EnvConfiguration
 import org.apache.linkis.manager.engineplugin.common.launch.entity.EngineConnBuildRequest
-import org.apache.linkis.manager.engineplugin.common.launch.process.Environment.{variable, USER}
-import org.apache.linkis.manager.engineplugin.common.launch.process.JavaProcessEngineConnLaunchBuilder
+import org.apache.linkis.manager.engineplugin.common.launch.process.{
+  Environment,
+  JavaProcessEngineConnLaunchBuilder
+}
+import org.apache.linkis.manager.engineplugin.common.launch.process.Environment.{
+  variable,
+  PWD,
+  USER
+}
+import org.apache.linkis.manager.engineplugin.common.launch.process.LaunchConstants.{
+  addPathToClassPath,
+  CLASS_PATH_SEPARATOR
+}
 import org.apache.linkis.manager.label.entity.engine.UserCreatorLabel
 
 import java.util
@@ -82,6 +93,19 @@ class FlinkEngineConnLaunchBuilder extends JavaProcessEngineConnLaunchBuilder {
     bmlResources
   }
 
+  override def getEnvironment(implicit
+      engineConnBuildRequest: EngineConnBuildRequest
+  ): util.Map[String, String] = {
+    val environment = new util.HashMap[String, String]
+    addPathToClassPath(environment, variable(PWD))
+    val linkisEnvironment = super.getEnvironment
+    val linkisClassPath = linkisEnvironment.get(Environment.CLASSPATH.toString)
+    val v = environment.get(Environment.CLASSPATH.toString) + CLASS_PATH_SEPARATOR + linkisClassPath
+    environment.put(Environment.CLASSPATH.toString, v)
+    logger.info(environment.asScala.map(e => s"${e._1}->${e._2}").mkString(","))
+    environment
+  }
+
   private def contentToBmlResource(userName: String, content: String): BmlResource = {
     val contentMap = JsonUtils.jackson.readValue(content, classOf[util.Map[String, Object]])
     contentToBmlResource(userName, contentMap)