aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2015-10-04 11:14:28 -0400
committerPeter Eisentraut <peter_e@gmx.net>2015-10-04 12:29:36 -0400
commit6390c8c654d07c08686adbbc595a13d76b573653 (patch)
tree9b301f6653f4c8727b2f2703c5be70472b5f3b40 /src
parentcf007a4bca59a1bca6951351e10ff227d2b0c10a (diff)
downloadpostgresql-6390c8c654d07c08686adbbc595a13d76b573653.tar.gz
postgresql-6390c8c654d07c08686adbbc595a13d76b573653.zip
Group cluster_name and update_process_title settings together
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/misc/guc.c6
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample6
-rw-r--r--src/include/utils/guc_tables.h1
3 files changed, 10 insertions, 3 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 7684bff79b1..71090f2d4f1 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -580,6 +580,8 @@ const char *const config_group_names[] =
gettext_noop("Reporting and Logging / When to Log"),
/* LOGGING_WHAT */
gettext_noop("Reporting and Logging / What to Log"),
+ /* PROCESS_TITLE */
+ gettext_noop("Process Title"),
/* STATS */
gettext_noop("Statistics"),
/* STATS_MONITORING */
@@ -1180,7 +1182,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"update_process_title", PGC_SUSET, STATS_COLLECTOR,
+ {"update_process_title", PGC_SUSET, PROCESS_TITLE,
gettext_noop("Updates the process title to show the active SQL command."),
gettext_noop("Enables updating of the process title every time a new SQL command is received by the server.")
},
@@ -3395,7 +3397,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"cluster_name", PGC_POSTMASTER, LOGGING_WHAT,
+ {"cluster_name", PGC_POSTMASTER, PROCESS_TITLE,
gettext_noop("Sets the name of the cluster which is included in the process title."),
NULL,
GUC_IS_NAME
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index b2adda95958..dcf929f9937 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -447,8 +447,13 @@
# than the specified size in kilobytes;
# -1 disables, 0 logs all temp files
#log_timezone = 'GMT'
+
+
+# - Process Title -
+
#cluster_name = '' # added to process titles if nonempty
# (change requires restart)
+#update_process_title = on
#------------------------------------------------------------------------------
@@ -462,7 +467,6 @@
#track_io_timing = off
#track_functions = none # none, pl, all
#track_activity_query_size = 1024 # (change requires restart)
-#update_process_title = on
#stats_temp_directory = 'pg_stat_tmp'
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index 7a58ddb10b6..8da2e78a473 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -81,6 +81,7 @@ enum config_group
LOGGING_WHERE,
LOGGING_WHEN,
LOGGING_WHAT,
+ PROCESS_TITLE,
STATS,
STATS_MONITORING,
STATS_COLLECTOR,