X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdolda%2Fjsvc%2Fscgi%2FDirServer.java;h=1ac452c8139bfcc010ccebc368ca4d65d5c0e897;hb=48d0e295cb79948858eb5aa99cc08cdf9f9e4546;hp=8f19d8a115906bcd21609f74fc4887389e650069;hpb=ecbf37771d3f59836e5930caf5f1b2665478eb92;p=jsvc.git

diff --git a/src/dolda/jsvc/scgi/DirServer.java b/src/dolda/jsvc/scgi/DirServer.java
index 8f19d8a..1ac452c 100644
--- a/src/dolda/jsvc/scgi/DirServer.java
+++ b/src/dolda/jsvc/scgi/DirServer.java
@@ -12,6 +12,7 @@ public class DirServer extends Server {
     private final Map<File, DSContext> contexts = new HashMap<File, DSContext>();
     private 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);
@@ -51,6 +52,32 @@ public class DirServer extends Server {
 	RequestThread w = ctx.tg.respond(req);
 	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();
+		DSContext ctx = e.getValue();
+		i.remove();
+		ctx.tg.shutdown();
+	    }
+	}
+	super.shutdown();
+    }
 
     private static void usage(PrintStream out) {
 	out.println("usage: dolda.jsvc.scgi.DirServer [-h] [-e CHARSET] [-d DATADIR] PORT");
@@ -100,6 +127,8 @@ public class DirServer extends Server {
 	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();
     }
 }