Changeset d199ced for fedd/fedd.py

Timestamp:

Oct 14, 2008 5:35:15 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

3925b50

Parents:

0b466d1

Message:

upgrade

File:

• fedd/fedd.py (modified) (4 diffs)

fedd/fedd.py

@@ -20 +20 @@
 from threading import *
 from signal import signal, pause, SIGINT, SIGTERM
-from select import select
+from select import select, error
 from time import sleep
 import logging
@@ -251 +251 @@
     """
     global servers_active, flog
+
     servers_active = False
     flog.info("Received signal %d, shutting down" % sig);
@@ -267 +268 @@
 
     while servers_active:
-        i, o, e = select((s,), (), (), 5.0)
-        if s in i: s.handle_request()
+        try:
+            i, o, e = select((s,), (), (), 1.0)
+            if s in i: s.handle_request()
+        except error:
+            # The select call seems to get interrupted by signals as well as
+            # the main thread.  This essentially ignores signals in this
+            # thread.
+            pass
 
     # Done.  Remove us from the list
@@ -356 +363 @@
 # Main thread waits for signals
 while servers_active:
-    pause()
+    sleep(1.0)
 
 #Once shutdown starts wait for all the servers to terminate.