← Back to branch summary

~pivanov/ipython/devel

« back to all changes in this revision

Viewing changes to IPython/kernel/engineconnector.py

  • Committer: Brian Granger
  • Date: 2008-12-07 00:24:30 UTC
  • mfrom: (1109.1.61 bg-trunk-dev)
  • Revision ID: ellisonbg@gmail.com-20081207002430-b97m241iy95tsl0i
New version of ipcluster and docs updates.

This branch has a complete rewrite of the ipcluster script.  The script
is now based on Twisted and has support for starting clusters using
PBS, mpirun and on localhost.

The developer docs have been fully updated to reflect our current
dev workflow with lp and bzr.

The changelog has been reformatted some to keep its style consistent.

A new security document has been aded that describes the Foolscap 
security model in depth.

Minor fixed to ipengine and ipcluster.

Show diffs side-by-side

added added

removed removed

Lines of Context:
IPython/kernel/engineconnector.py
18
18
import os
19
19
import cPickle as pickle
20
20
 
21
 
from twisted.python import log
 
21
from twisted.python import log, failure
 
22
from twisted.internet import defer
22
23
 
23
24
from IPython.kernel.fcutil import find_furl
24
25
from IPython.kernel.enginefc import IFCEngine
62
63
            self.tub.startService()
63
64
        self.engine_service = engine_service
64
65
        self.engine_reference = IFCEngine(self.engine_service)
65
 
        self.furl = find_furl(furl_or_file)
 
66
        try:
 
67
            self.furl = find_furl(furl_or_file)
 
68
        except ValueError:
 
69
            return defer.fail(failure.Failure())
 
70
            # return defer.fail(failure.Failure(ValueError('not a valid furl or furl file: %r' % furl_or_file)))
66
71
        d = self.tub.getReference(self.furl)
67
72
        d.addCallbacks(self._register, self._log_failure)
68
73
        return d
69
74
    
70
75
    def _log_failure(self, reason):
71
 
        log.err('engine registration failed:')
 
76
        log.err('EngineConnector: engine registration failed:')
72
77
        log.err(reason)
73
78
        return reason
74
79