Changeset 3566 in products

Timestamp:

Oct 1, 2012 1:01:03 PM (12 years ago)

Author:

potar

Message:

fixed ping to google (timeout was set)

File:

• quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/utils.py (modified) (3 diffs)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/utils.py

@@ -1 @@
-from urllib2 import urlopen
 from urllib import quote as urlquote
 from DateTime import DateTime
+import logging
+import urllib2
+import socket
 
 from Globals import DevelopmentMode
@@ -8 +10 @@
 
 from quintagroup.plonegooglesitemaps import config
+
+
+logger = logging.getLogger(__name__)
+
+
+# BBB: 'timeout' was added to urlopen in python2.6.
+# Method dedicated to compatibility with python2.4 and python2.5
+def urlopen(request, timeout=5.0, data=None, marker=[]):
+    global_timeout = marker
+    try:
+        try:
+            urllib2.urlopen(request, data, timeout=timeout)
+        except TypeError, e:
+            logger.info('TypeError: %s. You use python < 2.6. '
+                        'Ugly socket.setdefaulttimeout hack applied '
+                        'to avoid it upgrade your Plone.' % e)
+            # socket.getdefaulttimeout() -> None.
+            # It indicates that new socket objects have no timeout.
+            global_timeout = socket.getdefaulttimeout()
+            socket.setdefaulttimeout(timeout)
+            urllib2.urlopen(request)
+    finally:
+        if global_timeout is not marker:
+            socket.setdefaulttimeout(global_timeout)
 
 
@@ -20 +46 @@
         return 0
 
-    sitemap_url = urlquote(resurl)
-
-    g = urlopen('http://www.google.com/webmasters/tools/ping?sitemap=' +
-                sitemap_url)
-    g.read()
-    g.close()
+    request = 'http://www.google.com/webmasters/tools/ping?sitemap=' +\
+              urlquote(resurl)
+    try:
+        # BBB: Change urlopen -> socket.urlopen when
+        # compatibility with python2.4 is not important
+        g = urlopen(request)
+    except urllib2.URLError, e:
+        if hasattr(e, 'reason'):
+            logger.error('We failed to reach a server. '
+                         'Request: %s. '
+                         'Reason: %s' % (request, e.reason))
+        elif hasattr(e, 'code'):
+            logger.error('The server couldn\'t fulfill the request. '
+                         'Request: %s '
+                         'Error code: %s. ' % (request, e.code))
+    else:
+        # Reading single byte should be enough for server pinged
+        # to get our request, process it and send some response.
+        g.read(1)
+        g.close()
 
     return 0