added hazelcast and some modifications to align legacy YaCy with

YaCyGrid

3 files changed, 55 insertions, 6 deletions

diff --git a/htroot/api/localpeers.java b/htroot/api/localpeers.java
index ba933d125..920008bc5 100644
--- a/htroot/api/localpeers.java
+++ b/htroot/api/localpeers.java
@@ -17,7 +17,19 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Map;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import com.hazelcast.cluster.Member;
+import com.hazelcast.core.HazelcastInstance;
+
 import net.yacy.cora.protocol.RequestHeader;
+import net.yacy.cora.util.Memory;
 import net.yacy.search.Switchboard;
 import net.yacy.server.serverObjects;
 import net.yacy.server.serverSwitch;
@@ -28,14 +40,50 @@ public class localpeers {
     public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, @SuppressWarnings("unused") final serverObjects post, @SuppressWarnings("unused") final serverSwitch env) {
         final servletProperties prop = new servletProperties();
         int c = 0;
-        for (String urlstub: Switchboard.getSwitchboard().localpeers) {
-            prop.putJSON("peers_" + c + "_urlstub", urlstub);
+        for (String urlstub: Switchboard.getSwitchboard().localcluster_scan) {
+            prop.putJSON("peers_" + c + "_urlstub", urlstub); // a usrlstub is a full url with protocol, host and port up the the path start including first "/"
             c++;
         }
         prop.put("peers", c);
-
+        try {
+            prop.put("status", systemStatus().toString(2));
+        } catch (JSONException e) {
+            prop.put("status", "");
+        }
         // return rewrite properties
         return prop;
     }
 
-}
+    public static JSONObject systemStatus() throws JSONException {
+
+        // generate json
+        JSONObject systemStatus = new JSONObject(true);
+        Memory.status().forEach((k, v) -> {try {systemStatus.put(k, v);} catch (JSONException e) {}});
+        JSONArray members = new JSONArray();
+        HazelcastInstance hi = Switchboard.getSwitchboard().localcluster_hazelcast;
+        String uuid = hi.getCluster().getLocalMember().getUuid().toString();
+        hi.getMap("status").put(uuid, Memory.status());
+        for (Member member: hi.getCluster().getMembers()) {
+            JSONObject m = new JSONObject(true);
+            uuid = member.getUuid().toString();
+            m.put("uuid", uuid);
+            m.put("host", member.getAddress().getHost());
+            try {m.put("ip", member.getAddress().getInetAddress().getHostAddress());} catch (JSONException | UnknownHostException e) {}
+            m.put("port", member.getAddress().getPort());
+            m.put("isLite", member.isLiteMember());
+            m.put("isLocal", member.localMember());
+            @SuppressWarnings("unchecked")
+            Map<String, Object> status = (Map<String, Object>) hi.getMap("status").get(uuid);
+            m.put("status", status);
+            members.put(m);
+        }
+        systemStatus.put("hazelcast_cluster_name", hi.getConfig().getClusterName());
+        systemStatus.put("hazelcast_instance_name", hi.getConfig().getInstanceName());
+        Collection<String> interfaces = hi.getConfig().getNetworkConfig().getInterfaces().getInterfaces();
+        systemStatus.put("hazelcast_interfaces", interfaces);
+        systemStatus.put("hazelcast_members", members);
+        systemStatus.put("hazelcast_members_count", members.length());
+
+        return systemStatus;
+    }
+}
\ No newline at end of file
diff --git a/htroot/api/localpeers.json b/htroot/api/localpeers.json
index e2be9012d..4a6f747e2 100644
--- a/htroot/api/localpeers.json
+++ b/htroot/api/localpeers.json
@@ -1,5 +1,6 @@
 {
 "peers" : [#{peers|,}#
 {"urlstub":"#[urlstub]#"}
-#{/peers}#]
+#{/peers}#],
+"status": #[status]#
 }
\ No newline at end of file
diff --git a/htroot/api/status_p.java b/htroot/api/status_p.java
index 24b5ca1b6..1b877aa54 100644
--- a/htroot/api/status_p.java
+++ b/htroot/api/status_p.java
@@ -76,7 +76,7 @@ public class status_p {
         prop.putNum("usedDisk", sb.observer.getSizeOfDataPath(true));

         prop.putNum("freeDisk", sb.observer.getUsableSpace());

         prop.putNum("processors", WorkflowProcessor.availableCPU);

-        prop.putNum("load", Memory.load());

+        prop.putNum("load", Memory.getSystemLoadAverage());

 

         // proxy traffic

         prop.put("trafficIn", ByteCount.getGlobalCount());