You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2018/10/10 12:27:44 UTC
svn commit: r1843438 - in
/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccHandlerClassic.java DuccHandlerJsonFormat.java
Author: degenaro
Date: Wed Oct 10 12:27:44 2018
New Revision: 1843438
URL: http://svn.apache.org/viewvc?rev=1843438&view=rev
Log:
UIMA-5890 DUCC Web Server (WS) displays old boot date for re-cycled Broker
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1843438&r1=1843437&r2=1843438&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Wed Oct 10 12:27:44 2018
@@ -100,7 +100,6 @@ public class DuccHandlerClassic extends
private static Messages messages = Messages.getInstance();
private static DuccId jobid = null;
- private static BrokerHelper brokerHelper = BrokerHelper.getInstance();
private static DatabaseHelper databaseHelper = DatabaseHelper.getInstance();
private static INodeState nodeState = NodeState.getInstance();
@@ -1443,6 +1442,8 @@ public class DuccHandlerClassic extends
DuccDaemonsData duccDaemonsData = DuccDaemonsData.getInstance();
DuccMachinesData duccMachinesData = DuccMachinesData.getInstance();
+ BrokerHelper brokerHelper = BrokerHelper.getInstance();
+
int counter = 0;
boolean brokerAlive = brokerHelper.isAlive();
daemons:
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1843438&r1=1843437&r2=1843438&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Wed Oct 10 12:27:44 2018
@@ -116,7 +116,6 @@ public class DuccHandlerJsonFormat exten
private static Messages messages = Messages.getInstance();
private static DuccId jobid = null;
- private static BrokerHelper brokerHelper = BrokerHelper.getInstance();
private static DatabaseHelper databaseHelper = DatabaseHelper.getInstance();
private HelperSpecifications helperSpecifications = HelperSpecifications.getInstance();
@@ -2270,6 +2269,8 @@ public class DuccHandlerJsonFormat exten
DuccDaemonsData duccDaemonsData = DuccDaemonsData.getInstance();
DuccMachinesData duccMachinesData = DuccMachinesData.getInstance();
+ BrokerHelper brokerHelper = BrokerHelper.getInstance();
+
String wsHostIP = getWebServerHostIP();
String wsHostName = getWebServerHostName();
boolean brokerAlive = brokerHelper.isAlive();