X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdolda%2Fjsvc%2Fscgi%2FDirServer.java;h=209d1a4f145237fa0c6c6861051df5b75a27efe5;hb=f12fa57b8c0c5aef786a0111fd78cdb61dde9595;hp=d238504afe1b8bdca26e56138b975ad5de891ab3;hpb=0de513742ae180a370c7836aa285cc82a8e95f22;p=jsvc.git

diff --git a/src/dolda/jsvc/scgi/DirServer.java b/src/dolda/jsvc/scgi/DirServer.java
index d238504..209d1a4 100644
--- a/src/dolda/jsvc/scgi/DirServer.java
+++ b/src/dolda/jsvc/scgi/DirServer.java
@@ -7,11 +7,14 @@ import java.util.logging.*;
 import dolda.jsvc.*;
 import dolda.jsvc.util.*;
 import dolda.jsvc.j2ee.PosixArgs;
+import java.lang.management.ManagementFactory;
+import javax.management.*;
 
 public class DirServer extends Server {
     private final Map<File, DSContext> contexts = new HashMap<File, DSContext>();
-    private final Environment env;
+    public final Environment env;
     private final Logger logger = Logger.getLogger("dolda.jsvc.scgi.dirserver");
+    private Thread sdhook = null, main = null;
     
     public DirServer(ServerSocket sk, Environment env) {
 	super(sk);
@@ -25,6 +28,11 @@ public class DirServer extends Server {
 	    if(ctx != null) {
 		if(ctx.mtime < file.lastModified()) {
 		    ctx.tg.shutdown();
+		    try {
+			ManagementFactory.getPlatformMBeanServer().unregisterMBean(ctx.mbean.name);
+		    } catch(InstanceNotFoundException e) {
+		    } catch(MBeanRegistrationException e) {
+		    }
 		    contexts.remove(file);
 		    ctx = null;
 		    act = "reloaded %s as %s";
@@ -32,6 +40,12 @@ public class DirServer extends Server {
 	    }
 	    if(ctx == null) {
 		ctx = new DSContext(file, env);
+		try {
+		    ManagementFactory.getPlatformMBeanServer().registerMBean(ctx.mbean, ctx.mbean.name);
+		} catch(InstanceAlreadyExistsException e) {
+		} catch(MBeanRegistrationException e) {
+		} catch(NotCompliantMBeanException e) {
+		}
 		contexts.put(file, ctx);
 		logger.config(String.format(act, file, ctx.name()));
 	    }
@@ -52,7 +66,21 @@ public class DirServer extends Server {
 	w.start();
     }
     
+    private class ShutdownHandler extends Thread {
+	public void run() {
+	    sdhook = null;
+	    DirServer.this.stop();
+	    try {
+		main.join();
+	    } catch(InterruptedException e) {}
+	}
+    }
+
     protected void shutdown() {
+	try {
+	    if(sdhook != null)
+		Runtime.getRuntime().removeShutdownHook(sdhook);
+	} catch(Exception e) {}
 	synchronized(contexts) {
 	    for(Iterator<Map.Entry<File, DSContext>> i = contexts.entrySet().iterator(); i.hasNext();) {
 		Map.Entry<File, DSContext> e = i.next();
@@ -61,6 +89,12 @@ public class DirServer extends Server {
 		ctx.tg.shutdown();
 	    }
 	}
+	super.shutdown();
+	try {
+	    ManagementFactory.getPlatformMBeanServer().unregisterMBean(dolda.jsvc.scgi.jmx.Server.name);
+	} catch(InstanceNotFoundException e) {
+	} catch(MBeanRegistrationException e) {
+	}
     }
 
     private static void usage(PrintStream out) {
@@ -68,7 +102,7 @@ public class DirServer extends Server {
     }
     
     public static void main(String[] args) {
-	PosixArgs opt = PosixArgs.getopt(args, "h");
+	PosixArgs opt = PosixArgs.getopt(args, "he:d:");
 	if(opt == null) {
 	    usage(System.err);
 	    System.exit(1);
@@ -108,9 +142,17 @@ public class DirServer extends Server {
 	    return; /* Because javac is stupid. :-/ */
 	}
 	DirServer s = new DirServer(sk, env);
+	try {
+	    ManagementFactory.getPlatformMBeanServer().registerMBean(new dolda.jsvc.scgi.jmx.Server(s), dolda.jsvc.scgi.jmx.Server.name);
+	} catch(InstanceAlreadyExistsException e) {
+	} catch(MBeanRegistrationException e) {
+	} catch(NotCompliantMBeanException e) {
+	}
 	if(charset != null)
 	    s.headcs = charset;
 	
-	new Thread(s, "SCGI server thread").start();
+	Runtime.getRuntime().addShutdownHook(s.sdhook = s.new ShutdownHandler());
+	s.main = new Thread(s, "SCGI server thread");
+	s.main.start();
     }
 }