diff options
| author |  Leon Sandøy <[email protected]> | 2018-07-18 20:08:22 +0000 |
|---|---|---|
| committer | Leon Sandøy <[email protected]> | 2018-07-18 20:08:22 +0000 |
| commit | 33f8f67fcd8ebfdc379d7f248ca167df0bd7827d (patch) | |
| tree | 49c254a2f5fff9d6649cdf53237b4337b4bf0691 /pysite | |
| parent | Merge remote-tracking branch 'origin/master' (diff) | |
| parent | updates docker-compose, changes default rdb port and handles a socket error i... (diff) | |
Merge branch 'update-dev-env' into 'master'
update dev env
See merge request python-discord/projects/site!18
Diffstat (limited to 'pysite')
| -rw-r--r-- | pysite/database.py | 2 | ||||
| -rw-r--r-- | pysite/service_discovery.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pysite/database.py b/pysite/database.py index bb0c3415..ddf79a31 100644 --- a/pysite/database.py +++ b/pysite/database.py @@ -18,7 +18,7 @@ class RethinkDB: def __init__(self, loop_type: Optional[str] = "gevent"): self.host = os.environ.get("RETHINKDB_HOST", "127.0.0.1") - self.port = os.environ.get("RETHINKDB_PORT", "28016") + self.port = os.environ.get("RETHINKDB_PORT", "28015") self.database = os.environ.get("RETHINKDB_DATABASE", "pythondiscord") self.log = logging.getLogger(__name__) self.conn = None diff --git a/pysite/service_discovery.py b/pysite/service_discovery.py index 2852c2fb..a03341c4 100644 --- a/pysite/service_discovery.py +++ b/pysite/service_discovery.py @@ -16,7 +16,11 @@ def wait_for_rmq(): return False with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock: - if sock.connect_ex((RMQ_HOST, RMQ_PORT)) == 0: - return True + try: + state = sock.connect_ex((RMQ_HOST, RMQ_PORT)) + if state == 0: + return True + except socket.gaierror: + pass time.sleep(0.5) |