urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
master
martin f. krafft 2008-03-21 23:17:38 +01:00 committed by Joey Hess
parent 9134145d82
commit 460d74fa78
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/proxy.py
View File

@ -118,7 +118,8 @@ class _IkiWikiExtPluginXMLRPCHandler(object):
self._debug_fn('read response to procedure %s from ikiwiki: [%s]' % (cmd, xml)) self._debug_fn('read response to procedure %s from ikiwiki: [%s]' % (cmd, xml))
if xml is None: if xml is None:
# ikiwiki is going down # 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] data = xmlrpclib.loads(xml)[0][0]
self._debug_fn('parsed data from response to procedure %s: [%s]' % (cmd, data)) self._debug_fn('parsed data from response to procedure %s: [%s]' % (cmd, data))
@ -130,7 +131,7 @@ class _IkiWikiExtPluginXMLRPCHandler(object):
if xml is None: if xml is None:
# ikiwiki is going down # ikiwiki is going down
self._debug_fn('ikiwiki is going down, and so are we...') 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) self._debug_fn('received procedure call from ikiwiki: [%s]' % xml)
params, method = xmlrpclib.loads(xml) params, method = xmlrpclib.loads(xml)
@ -140,6 +141,9 @@ class _IkiWikiExtPluginXMLRPCHandler(object):
_IkiWikiExtPluginXMLRPCHandler._write(out_fd, xml) _IkiWikiExtPluginXMLRPCHandler._write(out_fd, xml)
return ret return ret
class _GoingDown:
pass
class IkiWikiProcedureProxy(object): class IkiWikiProcedureProxy(object):
# how to communicate None to ikiwiki # how to communicate None to ikiwiki
@ -241,7 +245,6 @@ class IkiWikiProcedureProxy(object):
except IOError, e: except IOError, e:
if e.errno != 32: if e.errno != 32:
raise raise
import posix import posix
sys.exit(posix.EX_SOFTWARE) sys.exit(posix.EX_SOFTWARE)
@ -249,15 +252,15 @@ class IkiWikiProcedureProxy(object):
try: try:
while True: while True:
ret = self._xmlrpc_handler.handle_rpc(self._in_fd, self._out_fd) ret = self._xmlrpc_handler.handle_rpc(self._in_fd, self._out_fd)
if ret is None:
return
time.sleep(IkiWikiProcedureProxy._LOOP_DELAY) time.sleep(IkiWikiProcedureProxy._LOOP_DELAY)
except _IkiWikiExtPluginXMLRPCHandler._GoingDown:
return
except Exception, e: except Exception, e:
import traceback import traceback
self.error('uncaught exception: %s\n%s' \ self.error('uncaught exception: %s\n%s' \
% (e, traceback.format_exc(sys.exc_info()[2]))) % (e, traceback.format_exc(sys.exc_info()[2])))
import posix return
sys.exit(posix.EX_SOFTWARE)
def _importme(self): def _importme(self):
self._debug_fn('importing...') self._debug_fn('importing...')