77 }), |
77 }), |
78 ('pyro-ns-host', |
78 ('pyro-ns-host', |
79 {'type' : 'string', |
79 {'type' : 'string', |
80 'default': None, |
80 'default': None, |
81 'help': 'Pyro name server\'s host. If not set, default to the value \ |
81 'help': 'Pyro name server\'s host. If not set, default to the value \ |
82 from all_in_one.conf.', |
82 from all_in_one.conf. It may contains port information using <host>:<port> notation.', |
83 'group': 'pyro-source', 'inputlevel': 1, |
|
84 }), |
|
85 ('pyro-ns-port', |
|
86 {'type' : 'int', |
|
87 'default': None, |
|
88 'help': 'Pyro name server\'s listening port. If not set, default to \ |
|
89 the value from all_in_one.conf.', |
|
90 'group': 'pyro-source', 'inputlevel': 1, |
83 'group': 'pyro-source', 'inputlevel': 1, |
91 }), |
84 }), |
92 ('pyro-ns-group', |
85 ('pyro-ns-group', |
93 {'type' : 'string', |
86 {'type' : 'string', |
94 'default': None, |
87 'default': None, |
212 session.close() |
205 session.close() |
213 |
206 |
214 def _get_connection(self): |
207 def _get_connection(self): |
215 """open and return a connection to the source""" |
208 """open and return a connection to the source""" |
216 nshost = self.config.get('pyro-ns-host') or self.repo.config['pyro-ns-host'] |
209 nshost = self.config.get('pyro-ns-host') or self.repo.config['pyro-ns-host'] |
217 nsport = self.config.get('pyro-ns-port') or self.repo.config['pyro-ns-port'] |
|
218 nsgroup = self.config.get('pyro-ns-group') or self.repo.config['pyro-ns-group'] |
210 nsgroup = self.config.get('pyro-ns-group') or self.repo.config['pyro-ns-group'] |
219 #cnxprops = ConnectionProperties(cnxtype=self.config['cnx-type']) |
211 #cnxprops = ConnectionProperties(cnxtype=self.config['cnx-type']) |
220 return dbapi.connect(database=self.config['pyro-ns-id'], |
212 return dbapi.connect(database=self.config['pyro-ns-id'], |
221 login=self.config['cubicweb-user'], |
213 login=self.config['cubicweb-user'], |
222 password=self.config['cubicweb-password'], |
214 password=self.config['cubicweb-password'], |
223 host=nshost, port=nsport, group=nsgroup, |
215 host=nshost, group=nsgroup, |
224 setvreg=False) #cnxprops=cnxprops) |
216 setvreg=False) #cnxprops=cnxprops) |
225 |
217 |
226 def get_connection(self): |
218 def get_connection(self): |
227 try: |
219 try: |
228 return self._get_connection() |
220 return self._get_connection() |