CMFActivity: make ActivityTool compatible with WSGI

f46d70f9 · Bryton Lacquement · Julien Muchembled · c33d2d1d · f46d70f9
Commit f46d70f9 authored Jun 07, 2019 by Bryton Lacquement 🚪 Committed by Julien Muchembled Jun 24, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 8 deletions

product/CMFActivity/ActivityTool.py product/CMFActivity/ActivityTool.py +13 -8

No files found.
--- a/product/CMFActivity/ActivityTool.py
+++ b/product/CMFActivity/ActivityTool.py
@@ -134,14 +134,19 @@ def getServerAddress():
    global _server_address
    if _server_address is None:
        ip = port = ''
-        from asyncore import socket_map
+        try:
-        for k, v in socket_map.items():
+            zopewsgi = sys.modules['Products.ERP5.bin.zopewsgi']
-            if hasattr(v, 'addr'):
+        except KeyError:
-                # see Zope/lib/python/App/ApplicationManager.py: def getServers(self)
+            from asyncore import socket_map
-                type = str(getattr(v, '__class__', 'unknown'))
+            for k, v in socket_map.items():
-                if type == 'ZServer.HTTPServer.zhttp_server':
+                if hasattr(v, 'addr'):
-                    ip, port = v.addr
+                    # see Zope/lib/python/App/ApplicationManager.py: def getServers(self)
-                    break
+                    type = str(getattr(v, '__class__', 'unknown'))
+                    if type == 'ZServer.HTTPServer.zhttp_server':
+                        ip, port = v.addr
+                        break
+        else:
+            ip, port = zopewsgi.server.addr
        if ip == '0.0.0.0':
            ip = socket.gethostbyname(socket.gethostname())
        _server_address = '%s:%s' %(ip, port)