summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authormartin f. krafft <madduck@madduck.net>2008-03-21 23:17:38 +0100
committerJoey Hess <joey@kodama.kitenet.net>2008-03-21 19:17:00 -0400
commit460d74fa782c1c2de3691249005b495ade237c93 (patch)
tree058a771e3923da5c669f9de80f996b1af4e04606 /plugins
parent9134145d827c38dc2ee4347e9ee1a83aeedbe187 (diff)
Handle going down with an exception
We previously used None as a sentinel to exit, but None is now a proper value, so now it's the job of an exception-like object (except it isn't an exception). Signed-off-by: martin f. krafft <madduck@madduck.net>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/proxy.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/proxy.py b/plugins/proxy.py
index 2b841000e..477a365f8 100644
--- a/plugins/proxy.py
+++ b/plugins/proxy.py
@@ -118,7 +118,8 @@ class _IkiWikiExtPluginXMLRPCHandler(object):
self._debug_fn('read response to procedure %s from ikiwiki: [%s]' % (cmd, xml))
if xml is None:
# ikiwiki is going down
- return None
+ self._debug_fn('ikiwiki is going down, and so are we...')
+ raise _IkiWikiExtPluginXMLRPCHandler._GoingDown
data = xmlrpclib.loads(xml)[0][0]
self._debug_fn('parsed data from response to procedure %s: [%s]' % (cmd, data))
@@ -130,7 +131,7 @@ class _IkiWikiExtPluginXMLRPCHandler(object):
if xml is None:
# ikiwiki is going down
self._debug_fn('ikiwiki is going down, and so are we...')
- return
+ raise _IkiWikiExtPluginXMLRPCHandler._GoingDown
self._debug_fn('received procedure call from ikiwiki: [%s]' % xml)
params, method = xmlrpclib.loads(xml)
@@ -140,6 +141,9 @@ class _IkiWikiExtPluginXMLRPCHandler(object):
_IkiWikiExtPluginXMLRPCHandler._write(out_fd, xml)
return ret
+ class _GoingDown:
+ pass
+
class IkiWikiProcedureProxy(object):
# how to communicate None to ikiwiki
@@ -241,7 +245,6 @@ class IkiWikiProcedureProxy(object):
except IOError, e:
if e.errno != 32:
raise
-
import posix
sys.exit(posix.EX_SOFTWARE)
@@ -249,15 +252,15 @@ class IkiWikiProcedureProxy(object):
try:
while True:
ret = self._xmlrpc_handler.handle_rpc(self._in_fd, self._out_fd)
- if ret is None:
- return
time.sleep(IkiWikiProcedureProxy._LOOP_DELAY)
+ except _IkiWikiExtPluginXMLRPCHandler._GoingDown:
+ return
+
except Exception, e:
import traceback
self.error('uncaught exception: %s\n%s' \
% (e, traceback.format_exc(sys.exc_info()[2])))
- import posix
- sys.exit(posix.EX_SOFTWARE)
+ return
def _importme(self):
self._debug_fn('importing...')