Robert Brewer avatar Robert Brewer committed 790f63a

3.0.x fix: test_states was failing because engine.restart was calling signal.signal in a thread other than the main thread.

Comments (0)

Files changed (1)

cherrypy/_cpengine.py

             self.stop()
     
     def _set_signals(self):
-        if self.SIGHUP:
-            signal.signal(signal.SIGHUP, self.SIGHUP)
-        if self.SIGTERM:
-            signal.signal(signal.SIGTERM, self.SIGTERM)
-    
+        try:
+            if self.SIGHUP:
+                signal.signal(signal.SIGHUP, self.SIGHUP)
+            if self.SIGTERM:
+                signal.signal(signal.SIGTERM, self.SIGTERM)
+        except ValueError, x:
+            if x.args[0] != 'signal only works in main thread':
+                raise
     
     #                           Drop privileges                           #
     
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.