pg_createsubscriber: Message style improvements

petere · petere · commit 5687f8c0dd76 · 2024-07-26T14:55:42.000+02:00
Refactor some messages, improve quoting.
diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c
@@ -897,17 +897,17 @@ check_publisher(const struct LogicalRepInfo *dbinfo)
 	{
 		pg_log_error("publisher requires %d replication slots, but only %d remain",
 					 num_dbs, max_repslots - cur_repslots);
-		pg_log_error_hint("Consider increasing max_replication_slots to at least %d.",
-						  cur_repslots + num_dbs);
+		pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",
+						  "max_replication_slots", cur_repslots + num_dbs);
 		failed = true;
 	}
 
 	if (max_walsenders - cur_walsenders < num_dbs)
 	{
 		pg_log_error("publisher requires %d wal sender processes, but only %d remain",
 					 num_dbs, max_walsenders - cur_walsenders);
-		pg_log_error_hint("Consider increasing max_wal_senders to at least %d.",
-						  cur_walsenders + num_dbs);
+		pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",
+						  "max_wal_senders", cur_walsenders + num_dbs);
 		failed = true;
 	}
 
@@ -1003,26 +1003,26 @@ check_subscriber(const struct LogicalRepInfo *dbinfo)
 	{
 		pg_log_error("subscriber requires %d replication slots, but only %d remain",
 					 num_dbs, max_repslots);
-		pg_log_error_hint("Consider increasing max_replication_slots to at least %d.",
-						  num_dbs);
+		pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",
+						  "max_replication_slots", num_dbs);
 		failed = true;
 	}
 
 	if (max_lrworkers < num_dbs)
 	{
 		pg_log_error("subscriber requires %d logical replication workers, but only %d remain",
 					 num_dbs, max_lrworkers);
-		pg_log_error_hint("Consider increasing max_logical_replication_workers to at least %d.",
-						  num_dbs);
+		pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",
+						  "max_logical_replication_workers", num_dbs);
 		failed = true;
 	}
 
 	if (max_wprocs < num_dbs + 1)
 	{
 		pg_log_error("subscriber requires %d worker processes, but only %d remain",
 					 num_dbs + 1, max_wprocs);
-		pg_log_error_hint("Consider increasing max_worker_processes to at least %d.",
-						  num_dbs + 1);
+		pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",
+						  "max_worker_processes", num_dbs + 1);
 		failed = true;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -897,17 +897,17 @@ check_publisher(const struct LogicalRepInfo *dbinfo)`
`897`	`897`	`{`
`898`	`898`	`pg_log_error("publisher requires %d replication slots, but only %d remain",`
`899`	`899`	`num_dbs, max_repslots - cur_repslots);`
`900`		`- pg_log_error_hint("Consider increasing max_replication_slots to at least %d.",`
`901`		`- cur_repslots + num_dbs);`
	`900`	`+ pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",`
	`901`	`+ "max_replication_slots", cur_repslots + num_dbs);`
`902`	`902`	`failed = true;`
`903`	`903`	`}`
`904`	`904`
`905`	`905`	`if (max_walsenders - cur_walsenders < num_dbs)`
`906`	`906`	`{`
`907`	`907`	`pg_log_error("publisher requires %d wal sender processes, but only %d remain",`
`908`	`908`	`num_dbs, max_walsenders - cur_walsenders);`
`909`		`- pg_log_error_hint("Consider increasing max_wal_senders to at least %d.",`
`910`		`- cur_walsenders + num_dbs);`
	`909`	`+ pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",`
	`910`	`+ "max_wal_senders", cur_walsenders + num_dbs);`
`911`	`911`	`failed = true;`
`912`	`912`	`}`
`913`	`913`
`@@ -1003,26 +1003,26 @@ check_subscriber(const struct LogicalRepInfo *dbinfo)`
`1003`	`1003`	`{`
`1004`	`1004`	`pg_log_error("subscriber requires %d replication slots, but only %d remain",`
`1005`	`1005`	`num_dbs, max_repslots);`
`1006`		`- pg_log_error_hint("Consider increasing max_replication_slots to at least %d.",`
`1007`		`- num_dbs);`
	`1006`	`+ pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",`
	`1007`	`+ "max_replication_slots", num_dbs);`
`1008`	`1008`	`failed = true;`
`1009`	`1009`	`}`
`1010`	`1010`
`1011`	`1011`	`if (max_lrworkers < num_dbs)`
`1012`	`1012`	`{`
`1013`	`1013`	`pg_log_error("subscriber requires %d logical replication workers, but only %d remain",`
`1014`	`1014`	`num_dbs, max_lrworkers);`
`1015`		`- pg_log_error_hint("Consider increasing max_logical_replication_workers to at least %d.",`
`1016`		`- num_dbs);`
	`1015`	`+ pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",`
	`1016`	`+ "max_logical_replication_workers", num_dbs);`
`1017`	`1017`	`failed = true;`
`1018`	`1018`	`}`
`1019`	`1019`
`1020`	`1020`	`if (max_wprocs < num_dbs + 1)`
`1021`	`1021`	`{`
`1022`	`1022`	`pg_log_error("subscriber requires %d worker processes, but only %d remain",`
`1023`	`1023`	`num_dbs + 1, max_wprocs);`
`1024`		`- pg_log_error_hint("Consider increasing max_worker_processes to at least %d.",`
`1025`		`- num_dbs + 1);`
	`1024`	`+ pg_log_error_hint("Increase the configuration parameter \"%s\" to at least %d.",`
	`1025`	`+ "max_worker_processes", num_dbs + 1);`
`1026`	`1026`	`failed = true;`
`1027`	`1027`	`}`
`1028`	`1028`