98 from cubicweb.server.repository import Repository |
98 from cubicweb.server.repository import Repository |
99 return Repository(config, vreg=vreg) |
99 return Repository(config, vreg=vreg) |
100 else: # method == 'pyro' |
100 else: # method == 'pyro' |
101 # resolve the Pyro object |
101 # resolve the Pyro object |
102 from logilab.common.pyro_ext import ns_get_proxy |
102 from logilab.common.pyro_ext import ns_get_proxy |
|
103 pyroid = database or config['pyro-instance-id'] or config.appid |
103 try: |
104 try: |
104 return ns_get_proxy(database, |
105 return ns_get_proxy(pyroid, defaultnsgroup=config['pyro-ns-group'], |
105 defaultnsgroup=config['pyro-ns-group'], |
|
106 nshost=config['pyro-ns-host']) |
106 nshost=config['pyro-ns-host']) |
107 except Exception, ex: |
107 except Exception, ex: |
108 raise ConnectionError(str(ex)) |
108 raise ConnectionError(str(ex)) |
109 |
109 |
110 def repo_connect(repo, login, **kwargs): |
110 def repo_connect(repo, login, **kwargs): |