[Erp5-report] r33943 luke - /erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recip...

[nobody at svn.erp5.org]

Author: luke
Date: Mon Mar 22 11:11:21 2010
New Revision: 33943

URL: http://svn.erp5.org?rev=33943&view=rev
Log:
 - try to connect to instance port to check if site is running

Modified:
    erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py

Modified: erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py?rev=33943&r1=33942&r2=33943&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py [utf8] Mon Mar 22 11:11:21 2010
@@ -13,7 +13,7 @@
 #
 ##############################################################################
 
-import os, sys, subprocess
+import os, sys, subprocess, socket
 from string import Template
 import zc.buildout
 import plone.recipe.zope2instance
@@ -137,14 +137,12 @@
     return []
 
   def is_site_running(self):
-    options = self.options
-    zopectl_path = os.path.join(options['bin-directory'],
-                  options['control-script'])
-    argv = [zopectl_path, 'status']
-    (result_std, result_err) = subprocess.Popen(argv, stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE).communicate()
-    result_std = result_std.strip()
-    if 'program running' in result_std:
+    # XXX: Oversimplification - assumes only Zope, w/o Zeo
+    options = self.options
+    port = int(options['http-address'])
+    result = socket.socket(socket.AF_INET, socket.SOCK_STREAM).connect_ex(
+        ('127.0.0.1', port))
+    if result == 0:
       return True
     return False