[Zope3-checkins] SVN: Zope3/branches/3.2/src/zope/app/twisted/ Merged from trunk:

[Jim Fulton]

Log message for revision 40849:
  Merged from trunk:
  
  r40848 | jim | 2005-12-17 10:51:16 -0500 (Sat, 17 Dec 2005) | 2 lines
  
  Fixed bug introduced by a recent variable renaming.
  
  ------------------------------------------------------------------------
    r40832 | jim | 2005-12-16 16:19:32 -0500 (Fri, 16 Dec 2005) | 2 lines
  
  Added some missing entries.
  
  ------------------------------------------------------------------------
    r40787 | jim | 2005-12-14 17:49:46 -0500 (Wed, 14 Dec 2005) | 4 lines
  
  Updated the twisted support to run the asyncore main loop to make sure
    that ZEO runs correctly.  Note that the tests for this are only run at
    run-level 2.
  

Changed:
  A   Zope3/branches/3.2/src/zope/app/twisted/asyncore_main_loop.py
  U   Zope3/branches/3.2/src/zope/app/twisted/main.py
  A   Zope3/branches/3.2/src/zope/app/twisted/tests/test_asyncore_main_loop.py
  A   Zope3/branches/3.2/src/zope/app/twisted/tests/test_zeo.py

-=-
Copied: Zope3/branches/3.2/src/zope/app/twisted/asyncore_main_loop.py (from rev 40787, Zope3/trunk/src/zope/app/twisted/asyncore_main_loop.py)


Property changes on: Zope3/branches/3.2/src/zope/app/twisted/asyncore_main_loop.py
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: Zope3/branches/3.2/src/zope/app/twisted/main.py
===================================================================
--- Zope3/branches/3.2/src/zope/app/twisted/main.py	2005-12-17 15:51:16 UTC (rev 40848)
+++ Zope3/branches/3.2/src/zope/app/twisted/main.py	2005-12-17 16:20:17 UTC (rev 40849)
@@ -33,6 +33,7 @@
 import zope.app.appsetup.interfaces
 from zope.app import wsgi
 from zope.app.twisted import log
+from zope.app.twisted import asyncore_main_loop
 
 CONFIG_FILENAME = "zope.conf"
 
@@ -78,6 +79,14 @@
     c1 = time.clock()
     logging.info("Startup time: %.3f sec real, %.3f sec CPU", t1-t0, c1-c0)
 
+    # Start the ThreadedAsync main loop.  This will either end immediately,
+    # or keep going if ZEO is around.  We don't actually care which.
+    def failed():
+        global should_restart
+        should_restart = True
+        reactor.callFromThread(reactor.stop)
+    reactor.callWhenRunning(asyncore_main_loop.run_in_thread, failed)
+
     reactor.run()
 
     # zdaemon will restart the process if it exits with an error

Copied: Zope3/branches/3.2/src/zope/app/twisted/tests/test_asyncore_main_loop.py (from rev 40787, Zope3/trunk/src/zope/app/twisted/tests/test_asyncore_main_loop.py)


Property changes on: Zope3/branches/3.2/src/zope/app/twisted/tests/test_asyncore_main_loop.py
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Copied: Zope3/branches/3.2/src/zope/app/twisted/tests/test_zeo.py (from rev 40787, Zope3/trunk/src/zope/app/twisted/tests/test_zeo.py)


Property changes on: Zope3/branches/3.2/src/zope/app/twisted/tests/test_zeo.py
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native