From 40ef76037aeac4ee2b9d857a092e5ea026c0bb5c Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 14 May 2014 13:23:26 +0200
Subject: Refactored Proxy update notification server into its own class and
 thread, so executions return before proxy messages are sent. Another deadlock
 suspect.

---
 .../com/c2kernel/entity/proxy/ProxyServer.java     | 106 +++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 src/main/java/com/c2kernel/entity/proxy/ProxyServer.java

(limited to 'src/main/java/com/c2kernel/entity/proxy/ProxyServer.java')

diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyServer.java b/src/main/java/com/c2kernel/entity/proxy/ProxyServer.java
new file mode 100644
index 0000000..c576cda
--- /dev/null
+++ b/src/main/java/com/c2kernel/entity/proxy/ProxyServer.java
@@ -0,0 +1,106 @@
+package com.c2kernel.entity.proxy;
+
+import java.util.ArrayList;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import com.c2kernel.process.Gateway;
+import com.c2kernel.utils.Logger;
+import com.c2kernel.utils.server.SimpleTCPIPServer;
+
+public class ProxyServer implements Runnable {
+
+    // server objects
+    ArrayList<ProxyClientConnection> proxyClients;
+    SimpleTCPIPServer proxyListener = null;
+    String serverName = null;
+    boolean keepRunning = true;
+    LinkedBlockingQueue<ProxyMessage> messageQueue;
+    
+	public ProxyServer(String serverName) {
+        Logger.msg(5, "ProxyManager::initServer - Starting.....");
+        int port = Gateway.getProperties().getInt("ItemServer.Proxy.port", 0);
+        this.serverName = serverName;
+        this.proxyClients = new ArrayList<ProxyClientConnection>();
+        this.messageQueue = new LinkedBlockingQueue<ProxyMessage>();
+        
+        if (port == 0) {
+            Logger.error("ItemServer.Proxy.port not defined in connect file. Remote proxies will not be informed of changes.");
+            return;
+        }
+
+        // set up the proxy server
+        try {
+            Logger.msg(5, "ProxyManager::initServer - Initialising proxy informer on port "+port);
+            proxyListener = new SimpleTCPIPServer(port, ProxyClientConnection.class, 200);
+            proxyListener.startListening();
+        } catch (Exception ex) {
+            Logger.error("Error setting up Proxy Server. Remote proxies will not be informed of changes.");
+            Logger.error(ex);
+        }
+        // start the message queue delivery thread
+        new Thread(this).start();
+	}
+	
+	@Override
+	public void run() {
+		
+		while(keepRunning) {
+			ProxyMessage message = messageQueue.poll();
+			if (message != null) {
+	            synchronized(proxyClients) {
+	                for (ProxyClientConnection client : proxyClients) {
+	                    client.sendMessage(message);
+	                }
+	            }
+			} else 
+				try {
+					synchronized(this) { wait(); }
+				} catch (InterruptedException e) { }
+		}
+
+	}
+
+	public String getServerName() {
+		return serverName;
+	}
+
+    public void sendProxyEvent(ProxyMessage message) {
+		try {
+			synchronized(this) { 
+				messageQueue.put(message);
+				notify(); 
+			}
+		} catch (InterruptedException e) { }
+    }
+
+    public void reportConnections(int logLevel) {
+        synchronized(proxyClients) {
+            Logger.msg(logLevel, "Currently connected proxy clients:");
+            for (ProxyClientConnection client : proxyClients) {
+                Logger.msg(logLevel, "   "+client);
+            }
+        }
+    }
+
+    public void shutdownServer() {
+        Logger.msg(1, "ProxyManager: Closing Server.");
+        proxyListener.stopListening();
+        synchronized(this) { 
+        	keepRunning = false; 
+        	notify();
+        }
+    }
+
+    public void registerProxyClient(ProxyClientConnection client) {
+        synchronized(proxyClients) {
+            proxyClients.add(client);
+        }
+    }
+
+    public void unRegisterProxyClient(ProxyClientConnection client) {
+        synchronized(proxyClients) {
+            proxyClients.remove(client);
+        }
+    }
+
+}
-- 
cgit v1.2.3