From 4d1c8ebcb5ad8c2f17b027d5bf23d063da419c9d Mon Sep 17 00:00:00 2001 From: Vignesh Date: Sat, 22 Mar 2025 18:56:15 +0530 Subject: [PATCH] Improve error reporting consistency in pg_createsubscriber Ensure consistent error reporting in pg_createsubscriber by including the option name in error messages. Additionally, replace pg_log_error and exit calls with pg_fatal. --- src/bin/pg_basebackup/pg_createsubscriber.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/bin/pg_basebackup/pg_createsubscriber.c b/src/bin/pg_basebackup/pg_createsubscriber.c index e2d6b7544bf..2b9ec24efc2 100644 --- a/src/bin/pg_basebackup/pg_createsubscriber.c +++ b/src/bin/pg_basebackup/pg_createsubscriber.c @@ -2063,10 +2063,7 @@ main(int argc, char **argv) num_dbs++; } else - { - pg_log_error("database \"%s\" specified more than once", optarg); - exit(1); - } + pg_fatal("database \"%s\" specified more than once for --database", optarg); break; case 'D': subscriber_dir = pg_strdup(optarg); @@ -2113,10 +2110,7 @@ main(int argc, char **argv) num_pubs++; } else - { - pg_log_error("publication \"%s\" specified more than once", optarg); - exit(1); - } + pg_fatal("publication \"%s\" specified more than once for --publication", optarg); break; case 3: if (!simple_string_list_member(&opt.replslot_names, optarg)) @@ -2125,10 +2119,7 @@ main(int argc, char **argv) num_replslots++; } else - { - pg_log_error("replication slot \"%s\" specified more than once", optarg); - exit(1); - } + pg_fatal("replication slot \"%s\" specified more than once for --replication-slot", optarg); break; case 4: if (!simple_string_list_member(&opt.sub_names, optarg)) @@ -2137,10 +2128,7 @@ main(int argc, char **argv) num_subs++; } else - { - pg_log_error("subscription \"%s\" specified more than once", optarg); - exit(1); - } + pg_fatal("subscription \"%s\" specified more than once for --subscription", optarg); break; default: /* getopt_long already emitted a complaint */ -- 2.43.0