Convert some stragglers to new frontend logging API

petere · petere · commit 95bbe5d82e42 · 2019-07-01T13:34:31.000+02:00
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -2663,8 +2663,8 @@ setup_text_search(void)
 		default_text_search_config = find_matching_ts_config(lc_ctype);
 		if (!default_text_search_config)
 		{
-			printf(_("%s: could not find suitable text search configuration for locale \"%s\"\n"),
-				   progname, lc_ctype);
+			pg_log_info("could not find suitable text search configuration for locale \"%s\"",
+						lc_ctype);
 			default_text_search_config = "simple";
 		}
 	}
@@ -2674,13 +2674,13 @@ setup_text_search(void)
 
 		if (checkmatch == NULL)
 		{
-			printf(_("%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"),
-				   progname, lc_ctype);
+			pg_log_warning("suitable text search configuration for locale \"%s\" is unknown",
+						   lc_ctype);
 		}
 		else if (strcmp(checkmatch, default_text_search_config) != 0)
 		{
-			printf(_("%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"),
-				   progname, default_text_search_config, lc_ctype);
+			pg_log_warning("specified text search configuration \"%s\" might not match locale \"%s\"",
+						   default_text_search_config, lc_ctype);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2663,8 +2663,8 @@ setup_text_search(void)`
`2663`	`2663`	`default_text_search_config = find_matching_ts_config(lc_ctype);`
`2664`	`2664`	`if (!default_text_search_config)`
`2665`	`2665`	`{`
`2666`		`- printf(_("%s: could not find suitable text search configuration for locale \"%s\"\n"),`
`2667`		`- progname, lc_ctype);`
	`2666`	`+ pg_log_info("could not find suitable text search configuration for locale \"%s\"",`
	`2667`	`+ lc_ctype);`
`2668`	`2668`	`default_text_search_config = "simple";`
`2669`	`2669`	`}`
`2670`	`2670`	`}`
`@@ -2674,13 +2674,13 @@ setup_text_search(void)`
`2674`	`2674`
`2675`	`2675`	`if (checkmatch == NULL)`
`2676`	`2676`	`{`
`2677`		`- printf(_("%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"),`
`2678`		`- progname, lc_ctype);`
	`2677`	`+ pg_log_warning("suitable text search configuration for locale \"%s\" is unknown",`
	`2678`	`+ lc_ctype);`
`2679`	`2679`	`}`
`2680`	`2680`	`else if (strcmp(checkmatch, default_text_search_config) != 0)`
`2681`	`2681`	`{`
`2682`		`- printf(_("%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"),`
`2683`		`- progname, default_text_search_config, lc_ctype);`
	`2682`	`+ pg_log_warning("specified text search configuration \"%s\" might not match locale \"%s\"",`
	`2683`	`+ default_text_search_config, lc_ctype);`
`2684`	`2684`	`}`
`2685`	`2685`	`}`
`2686`	`2686`