diff options
| author | Pete Vander Giessen <petevg@gmail.com> | 2017-04-26 14:19:47 -0400 |
|---|---|---|
| committer | Pete Vander Giessen <petevg@gmail.com> | 2017-04-26 14:19:47 -0400 |
| commit | 8a7e9664e5f8392aa7bc909595f240863114cac3 (patch) | |
| tree | 6fc2703548c0fb050c04bf3227df849462fdbc38 | |
| parent | ac8f5adb462a6ccff6e2df3a2819295aeb3976e8 (diff) | |
Made timeouts shorter again.
Timeout in add_model probably isn't a timeout, so giving up after a minute makes a lot of sense.
| -rw-r--r-- | matrix/rules.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/matrix/rules.py b/matrix/rules.py index d582672..065dba2 100644 --- a/matrix/rules.py +++ b/matrix/rules.py @@ -456,7 +456,7 @@ class RuleEngine: log.info("Connecting to model %s", self.model) context.juju_model = juju.model.Model(loop=self.loop) await asyncio.wait_for( - context.juju_model.connect_model(self.model), 600) + context.juju_model.connect_model(self.model), 60) else: # work-around for: https://bugs.launchpad.net/juju/+bug/1652171 credential = await self._get_credential(context) @@ -469,7 +469,7 @@ class RuleEngine: context.juju_controller.add_model( name, credential_name=credential, cloud_name=context.config.cloud, - ), 600) + ), 60) self.bus.dispatch( origin="matrix", payload=context.juju_model, |