@@ -36,6 +36,8 @@ def download(url, data = None, redir = False, offset = 0): try: dl_handle.perform() break + except KeyboardInterrupt: + raise except: if retry == MAX_RETRIES: raise CommException("Downloading %s failed "\ pydisco/disco/comm_curl.py @@ -74,6 +74,8 @@ def open_remote(url, data = None, expect = 200, offset = 0, ttl = MAX_RETRIES): sze = int(sze) return sze, fd + except KeyboardInterrupt: + raise except Exception, e: if not ttl: raise CommException("Downloading %s failed "\ pydisco/disco/comm_httplib.py @@ -50,6 +50,8 @@ class Disco(object): def request(self, url, data = None, redir = False, offset = 0): try: return comm.download(self.host + url, data = data, redir = redir, offset = offset) + except KeyboardInterrupt: + raise except Exception, e: raise DiscoError('Got %s, make sure disco master is running at %s' % (e, self.host)) pydisco/disco/core.py @@ -30,6 +30,8 @@ def find_gluster_mountpoint(path): def load_hostname_map(hmap): try: f = file(os.environ.get("DISCO_HOSTNAME_MAP", hmap)) + except KeyboardInterrupt: + raise except: raise DFSException("Hostname map not found at %s "\ "(you can specify another file in the "\ pydisco/disco/dfs/gluster.py @@ -30,6 +30,8 @@ class OutputStream(object): if self.handle.isatty(): curses.setupterm() return curses.tigetnum('colors') > 2 + except KeyboardInterrupt: + raise except: pass pydisco/disco/eventmonitor.py @@ -75,6 +75,8 @@ def re_reader(item_re_str, fd, content_len, fname, output_tail = False, read_buf r = fd.read(read_buffer_size) tot += len(r) buf += r + except KeyboardInterrupt: + raise except: data_err("Receiving data failed", fname) pydisco/disco/func.py @@ -114,6 +114,8 @@ def load_oob(host, name, key): fname = "%s/data/%s" % (ROOT, "/".join(loc.split("/")[3:])) try: return file(fname).read() + except KeyboardInterrupt: + raise except Exception: raise DiscoError("OOB key (%s) not found at %s" %\ (key, fname)) pydisco/disco/util.py c5723bf998803e38f07f847c08b511dee2e6298a Jarno Seppänen jseppanen@gmail.com http://github.com/tuulos/disco/commit/16e79d0501327d2c93853eebafc00e6f6e195d2b 16e79d0501327d2c93853eebafc00e6f6e195d2b 2009-10-04T19:20:29-07:00 2009-09-17T04:42:40-07:00 Fix ctrl-c handling, i.e., pass KeyboardInterrupt thru catch-all exception handlers a8b9f7d577526e4b73499da04b33995f05b70f2f Ville Tuulos tuulos@dxfront.(none)