gitops/patroni
1
0
Fork 0
mirror of https://github.com/outbackdingo/patroni.git synced 2026-08-25 14:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the recovery.conf based role check to a function.

Browse Source
This commit is contained in:
Oleksii Kliukin
2016-04-15 17:32:29 +02:00
parent c15c13876a
commit a07b015679
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patroni/postgresql.py
+5 -2
View File
@@ -79,7 +79,7 @@ class Postgresql(object):
self._state = 'stopped'
self._state_lock = Lock()
self._role = 'replica' if os.path.exists(self.recovery_conf) else 'master'
self._role = self.get_postgres_role_from_data_directory()
self._role_lock = Lock()
if self.is_running():
@@ -124,6 +124,9 @@ class Postgresql(object):
break
return local_address + ':' + self.port
def get_postgres_role_from_data_directory(self):
return 'replica' if os.path.exists(self.recovery_conf) else 'master'
@property
def _connect_kwargs(self):
r = parseurl('postgres://{0}/postgres'.format(self.local_address))
@@ -347,7 +350,7 @@ class Postgresql(object):
logger.error('Cannot start PostgreSQL because one is already running.')
return True
self.set_role('replica' if os.path.exists(self.recovery_conf) else 'master')
self.set_role(self.get_postgres_role_from_data_directory())
if os.path.exists(self.postmaster_pid):
os.remove(self.postmaster_pid)
logger.info('Removed %s', self.postmaster_pid)