From ca6e905f480122eccf959fcaa035b59a22e5d125 Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Sun, 25 Mar 2012 21:39:45 +0000 Subject: [PATCH] -first zkey then .+, catch exception for they are not critical --- src/gns/proxy/proxy.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/gns/proxy/proxy.py b/src/gns/proxy/proxy.py index 2807fafee..468256a11 100644 --- a/src/gns/proxy/proxy.py +++ b/src/gns/proxy/proxy.py @@ -138,16 +138,20 @@ class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler): out = soc data = i.recv(8192) if data: - if (re.match("(\w+\.)*gnunet", self.host_port[0])): - arr = self.host_port[0].split('.') - arr.pop(0) - data = re.sub('(a href="http://(\w+\.)*)(\+)', - self.replace_and_shorten(to_repl), data) - data = re.sub('(a href="http://(\w+\.)*zkey)', - self.shorten_zkey(), data) - #print data - out.send(data) - count = 0 + try: + data = re.sub('(a href="http://(\w+\.)*zkey)', + self.shorten_zkey(), data) + if (re.match("(\w+\.)*gnunet", self.host_port[0])): + arr = self.host_port[0].split('.') + arr.pop(0) + data = re.sub('(a href="http://(\w+\.)*)(\+)', + self.replace_and_shorten(to_repl), data) + #print data + out.send(data) + count = 0 + except: + print "GNS exception:", sys.exc_info()[0] + else: print "\t" "idle", count print msg -- 2.25.1