From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Sun, 25 Mar 2012 21:39:45 +0000 (+0000)
Subject: -first zkey then .+, catch exception for they are not critical
X-Git-Tag: initial-import-from-subversion-38251~14092
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca6e905f480122eccf959fcaa035b59a22e5d125;p=oweals%2Fgnunet.git

-first zkey then .+, catch exception for they are not critical
---

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