linkis adds shell engine support

close #283
apache · Feb 10, 2020 · 7d36637 · 7d36637
1 parent 702bf86
commit 7d36637
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...main/scala/com/webank/wedatasphere/linkis/engine/shell/executor/ShellEngineExecutor.scala b/...main/scala/com/webank/wedatasphere/linkis/engine/shell/executor/ShellEngineExecutor.scala
@@ -31,7 +31,7 @@ class ShellEngineExecutor(user:String)
 
  override protected def executeLine(engineExecutorContext: EngineExecutorContext, code: String): ExecuteResponse = {
  val trimCode = code.trim
- logger.info(s"user $user begin to run code $trimCode")
+ info(s"user $user begin to run code $trimCode")
  var bufferedReader:BufferedReader = null
  var errorsReader:BufferedReader = null
  try{
@@ -42,21 +42,21 @@ class ShellEngineExecutor(user:String)
  errorsReader = new BufferedReader(new InputStreamReader(process.getErrorStream))
  var line:String = null
  while({line = bufferedReader.readLine(); line != null}){
- logger.info(line)
+ info(line)
  engineExecutorContext.appendStdout(line)
  }
  val errorLog = Stream.continually(errorsReader.readLine).takeWhile(_ != null).mkString("\n")
  val exitCode = process.waitFor()
  if (StringUtils.isNotEmpty(errorLog) || exitCode != 0){
- logger.error(s"exitCode is $exitCode")
- logger.error(errorLog)
+ error(s"exitCode is $exitCode")
+ error(errorLog)
  engineExecutorContext.appendStdout("shell执行失败")
  engineExecutorContext.appendStdout(errorLog)
  ErrorExecuteResponse("run shell failed", ShellCodeErrorException())
  }else SuccessExecuteResponse()
  }catch{
  case e:Exception => {
- logger.error("Execute shell code failed, reason:", e)
+ error("Execute shell code failed, reason:", e)
  ErrorExecuteResponse("run shell failed" ,e)
  }
  case t:Throwable => ErrorExecuteResponse("执行shell进程内部错误", t)
@@ -84,9 +84,9 @@ class ShellEngineExecutor(user:String)
  process.destroy()
  true
  }catch{
- case e:Exception => logger.error(s"kill process ${process.toString} failed ", e)
+ case e:Exception => error(s"kill process ${process.toString} failed ", e)
  false
- case t:Throwable => logger.error(s"kill process ${process.toString} failed " ,t)
+ case t:Throwable => error(s"kill process ${process.toString} failed " ,t)
  false
  }
  }

diff --git a/...ala/com/webank/wedatasphere/linkis/engine/shell/executor/ShellEngineExecutorFactory.scala b/...ala/com/webank/wedatasphere/linkis/engine/shell/executor/ShellEngineExecutorFactory.scala
@@ -17,7 +17,7 @@ class ShellEngineExecutorFactory extends EngineExecutorFactory with Logging{
  //todo 可能会有一些设置环境变量的操作
  import scala.collection.JavaConverters._
  options.asScala foreach {
- case (k, v) => logger.info(s"key is $k, value is $v")
+ case (k, v) => info(s"key is $k, value is $v")
  }
  val user:String = System.getProperty("user.name")
  if (StringUtils.isEmpty(user)) throw NoCorrectUserException()