From f24cb3321f6d4bb97a413bf003259be2faa4e598 Mon Sep 17 00:00:00 2001 From: nature Date: Thu, 3 Nov 2022 18:12:05 +0800 Subject: [PATCH] Code rollback --- piflow-core/src/main/scala/cn/piflow/main.scala | 5 ++++- piflow-server/src/main/scala/cn/piflow/api/API.scala | 3 ++- piflow-server/src/main/scala/cn/piflow/api/HTTPService.scala | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/piflow-core/src/main/scala/cn/piflow/main.scala b/piflow-core/src/main/scala/cn/piflow/main.scala index 27b7a510..7214b227 100644 --- a/piflow-core/src/main/scala/cn/piflow/main.scala +++ b/piflow-core/src/main/scala/cn/piflow/main.scala @@ -802,9 +802,12 @@ class ProcessImpl(flow: Flow, runnerContext: Context, runner: Runner, parentProc outputs.saveData(debugPath) } + /* //monitor the throughput - if(null != PropertyUtil.getPropertyValue("monitor.throughput") && PropertyUtil.getPropertyValue("monitor.throughput").toBoolean == true) + if(null != PropertyUtil.getPropertyValue("monitor.throughput") && PropertyUtil.getPropertyValue("monitor.throughput").toBoolean == true) { runnerListener.monitorJobCompleted(pe.getContext(), outputs : JobOutputStream) + } + */ runnerListener.onJobCompleted(pe.getContext()); diff --git a/piflow-server/src/main/scala/cn/piflow/api/API.scala b/piflow-server/src/main/scala/cn/piflow/api/API.scala index e466cd88..a2179de9 100644 --- a/piflow-server/src/main/scala/cn/piflow/api/API.scala +++ b/piflow-server/src/main/scala/cn/piflow/api/API.scala @@ -512,13 +512,14 @@ object API { """{"stopWithGroup":"""" + resultList.mkString(",") + """"}""" } - + /* def getThroughput(appId:String, stopName:String, portName:String):String = { //test //H2Util.addThroughput("a","b","c",100) H2Util.getThroughput(appId, stopName, portName) // "out 200" } + */ private def getLogFile(uuid : String, appName : String) : (File,File) = { val now : Date = new Date() diff --git a/piflow-server/src/main/scala/cn/piflow/api/HTTPService.scala b/piflow-server/src/main/scala/cn/piflow/api/HTTPService.scala index f21871bc..0ee0bdcc 100644 --- a/piflow-server/src/main/scala/cn/piflow/api/HTTPService.scala +++ b/piflow-server/src/main/scala/cn/piflow/api/HTTPService.scala @@ -699,6 +699,7 @@ object HTTPService extends DefaultJsonProtocol with Directives with SprayJsonSup } } + /* case HttpRequest(GET, Uri.Path("/monitor/throughout"), headers, entity, protocol) => { val appId = req.getUri().query().getOrElse("appId", "") @@ -714,6 +715,7 @@ object HTTPService extends DefaultJsonProtocol with Directives with SprayJsonSup } } } + */ case HttpRequest(GET, Uri.Path("/visualDataDirectory/data"), headers, entity, protocol) =>{ try{