Changeset 3da9ea in indico

Timestamp:

06/29/11 15:34:07 (23 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

91cb2e

Parents:

bcee0f

Message:

[FIX] Surviving HTTPWithTimeout

• Also added logging;

File:

• indico/MaKaC/export/fileConverter.py (modified) (3 diffs)

indico/MaKaC/export/fileConverter.py

@@ -21 +21 @@
 import tempfile, os, base64, socket
 import mimetypes, urlparse, simplejson
+import httplib
+
+from MaKaC.common.logger import Logger
 from MaKaC.common.Configuration import Config
 from MaKaC import conference
-from MaKaC.common.httpTimeout import HTTPWithTimeout
 
 #URL_RESPONSE = "http://pcdh20.cern.ch/indico/getConvertedFile.py"
@@ -79 +81 @@
             #writeLog("Local file to upload invalid")
             return False
-        fic=open(localFile, "rb")
-        segnum=0
+        fic = open(localFile, "rb")
+        segnum = 0
         segsize = SEGMENT_SIZE
         filekey = 'segfile'
-        try :
-            h = HTTPWithTimeout(host, timeout = 5)
-        except Exception, e:
-            #writeLog("Error : Can't connect to host:%s"%host)
-            return False
 
         while 1:
@@ -148 +145 @@
 
             try:
-                h.putrequest('POST', selector)
-                h.putheader('content-type', content_type)
-                h.putheader('content-length', str(len(body)))
-                h.endheaders()
-                h.send(body)
-            except:
-                #writeLog("Exception while sending file to the CDSconv server")
-                pass
-            try:
-                h.getreply()
+                Logger.get('cdsconv').info("Uploading %s to %s" % (localFile, host))
+                h = httplib.HTTPConnection(host, timeout=5)
+                h.request('POST', selector, body, {'content-type': content_type})
+                h.getresponse()
             except socket.timeout:
+                Logger.get('cdsconv').exception("Timeout connecting to %s" % host)
                 break
             except Exception:
-                #writeLog(e)
-                pass
+                Logger.get('cdsconv').exception("Error connecting to %s" % host)
             if lastseg == 1 :
                 #print "\n%s\n"%(h.getfile().read())