##// END OF EJS Templates
Backport PR #2769: Allow shutdown when no engines are registered...
MinRK -
Show More
@@ -1155,14 +1155,17 b' class Client(HasTraits):'
1155 NOT IMPLEMENTED
1155 NOT IMPLEMENTED
1156 whether to restart engines after shutting them down.
1156 whether to restart engines after shutting them down.
1157 """
1157 """
1158
1158 from IPython.parallel.error import NoEnginesRegistered
1159 if restart:
1159 if restart:
1160 raise NotImplementedError("Engine restart is not yet implemented")
1160 raise NotImplementedError("Engine restart is not yet implemented")
1161
1161
1162 block = self.block if block is None else block
1162 block = self.block if block is None else block
1163 if hub:
1163 if hub:
1164 targets = 'all'
1164 targets = 'all'
1165 targets = self._build_targets(targets)[0]
1165 try:
1166 targets = self._build_targets(targets)[0]
1167 except NoEnginesRegistered:
1168 targets = []
1166 for t in targets:
1169 for t in targets:
1167 self.session.send(self._control_socket, 'shutdown_request',
1170 self.session.send(self._control_socket, 'shutdown_request',
1168 content={'restart':restart},ident=t)
1171 content={'restart':restart},ident=t)
@@ -1550,7 +1553,7 b' class Client(HasTraits):'
1550 elif header['msg_type'] == 'execute_reply':
1553 elif header['msg_type'] == 'execute_reply':
1551 res = ExecuteReply(msg_id, rcontent, md)
1554 res = ExecuteReply(msg_id, rcontent, md)
1552 else:
1555 else:
1553 raise KeyError("unhandled msg type: %r" % header[msg_type])
1556 raise KeyError("unhandled msg type: %r" % header['msg_type'])
1554 else:
1557 else:
1555 res = self._unwrap_exception(rcontent)
1558 res = self._unwrap_exception(rcontent)
1556 failures.append(res)
1559 failures.append(res)
General Comments 0
You need to be logged in to leave comments. Login now