Commitccdf25e

committed

Adapt to PG 12 where recovery.conf is obsolete.

1 parent568603c commitccdf25eCopy full SHA for ccdf25e

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -336,8 +336,15 @@ def _create_recovery_conf(self, username, slot=None):`
`336`	`336`
`337`	`337`	`line= (`
`338`	`338`	`"primary_conninfo='{}'\n"`
`339`		`-"standby_mode=on\n"`
`340`	`339`	`).format(options_string(**conninfo))# yapf: disable`
	`340`	`+# Since 12 recovery.conf had disappeared`
	`341`	`+ifself.version>='12':`
	`342`	`+signal_name=os.path.join(self.data_dir,"standby.signal")`
	`343`	`+# cross-python touch(). It is vulnerable to races, but who cares?`
	`344`	`+withopen(signal_name,'a'):`
	`345`	`+os.utime(signal_name,None)`
	`346`	`+else:`
	`347`	`+line+="standby_mode=on\n"`
`341`	`348`
`342`	`349`	`ifslot:`
`343`	`350`	`# Connect to master for some additional actions`
`@@ -363,7 +370,10 @@ def _create_recovery_conf(self, username, slot=None):`
`363`	`370`
`364`	`371`	`line+="primary_slot_name={}\n".format(slot)`
`365`	`372`
`366`		`-self.append_conf(filename=RECOVERY_CONF_FILE,line=line)`
	`373`	`+ifself.version>='12':`
	`374`	`+self.append_conf(line=line)`
	`375`	`+else:`
	`376`	`+self.append_conf(filename=RECOVERY_CONF_FILE,line=line)`
`367`	`377`
`368`	`378`	`def_maybe_start_logger(self):`
`369`	`379`	`iftestgres_config.use_python_logging:`

Comments

(0)