pgpool2.git / summary / log / commit / refs
commit 26cd47f12aebd1d7b4f623d7b1f12ebc90390059
Author: Bo Peng <pengbo@sraoss.co.jp>
Date: Wed Mar 24 15:25:50 2021 +0000
Fix comments in sample comfiguration files to avoid error occurred in pgpooladmin.
src/sample/pgpool.conf.sample-logical | 29 ++++++++++++++++++-----------
src/sample/pgpool.conf.sample-raw | 29 ++++++++++++++++++-----------
src/sample/pgpool.conf.sample-replication | 29 ++++++++++++++++++-----------
src/sample/pgpool.conf.sample-slony | 29 ++++++++++++++++++-----------
src/sample/pgpool.conf.sample-snapshot | 29 ++++++++++++++++++-----------
src/sample/pgpool.conf.sample-stream | 29 ++++++++++++++++++-----------
6 files changed, 108 insertions(+), 66 deletions(-)
diff --git a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
index 32ceb04d1..b0167cd8c 100644
--- a/src/sample/pgpool.conf.sample-logical
+++ b/src/sample/pgpool.conf.sample-logical
@@ -251,22 +251,26 @@ syslog_ident = 'pgpool'
# panic
# This is used when logging to stderr:
-#logging_collector = off # Enable capturing of stderr
+#logging_collector = off
+ # Enable capturing of stderr
# into log files.
# (change requires restart)
# -- Only used if logging_collector is on ---
-#log_directory = '/tmp/pgpool_log' # directory where log files are written,
+#log_directory = '/tmp/pgpool_log'
+ # directory where log files are written,
# can be absolute
#log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'
# log file name pattern,
# can include strftime() escapes
-#log_file_mode = 0600 # creation mode for log files,
+#log_file_mode = 0600
+ # creation mode for log files,
# begin with 0 to use octal notation
-#log_truncate_on_rotation = off # If on, an existing log file with the
+#log_truncate_on_rotation = off
+ # If on, an existing log file with the
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
@@ -275,10 +279,12 @@ syslog_ident = 'pgpool'
# off, meaning append to existing files
# in all cases.
-#log_rotation_age = 1d # Automatic rotation of logfiles will
+#log_rotation_age = 1d
+ # Automatic rotation of logfiles will
# happen after that (minutes)time.
# 0 disables time based rotation.
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
+#log_rotation_size = 10MB
+ # Automatic rotation of logfiles will
# happen after that much (KB) log output.
# 0 disables size based rotation.
@@ -367,10 +373,10 @@ write_function_list = ''
# Comma separated list of function names
# that write to database
# Regexp are accepted
- # If both read_only_function_list and write_function_list
- # is empty, function's volatile property is checked.
- # If it's volatile, the function is regarded as a
- # writing function.
+ # If both read_only_function_list and write_function_list
+ # is empty, function's volatile property is checked.
+ # If it's volatile, the function is regarded as a
+ # writing function.
primary_routing_query_pattern_list = ''
# Semicolon separated list of query patterns
@@ -695,7 +701,8 @@ enable_consensus_with_half_votes = off
# -- common --
-wd_monitoring_interfaces_list = '' # Comma separated list of interfaces names to monitor.
+wd_monitoring_interfaces_list = ''
+ # Comma separated list of interfaces names to monitor.
# if any interface from the list is active the watchdog will
# consider the network is fine
# 'any' to enable monitoring on all interfaces except loopback
diff --git a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw
index 312056e09..e351f9998 100644
--- a/src/sample/pgpool.conf.sample-raw
+++ b/src/sample/pgpool.conf.sample-raw
@@ -252,22 +252,26 @@ syslog_ident = 'pgpool'
# panic
# This is used when logging to stderr:
-#logging_collector = off # Enable capturing of stderr
+#logging_collector = off
+ # Enable capturing of stderr
# into log files.
# (change requires restart)
# -- Only used if logging_collector is on ---
-#log_directory = '/tmp/pgpool_log' # directory where log files are written,
+#log_directory = '/tmp/pgpool_log'
+ # directory where log files are written,
# can be absolute
#log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'
# log file name pattern,
# can include strftime() escapes
-#log_file_mode = 0600 # creation mode for log files,
+#log_file_mode = 0600
+ # creation mode for log files,
# begin with 0 to use octal notation
-#log_truncate_on_rotation = off # If on, an existing log file with the
+#log_truncate_on_rotation = off
+ # If on, an existing log file with the
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
@@ -276,10 +280,12 @@ syslog_ident = 'pgpool'
# off, meaning append to existing files
# in all cases.
-#log_rotation_age = 1d # Automatic rotation of logfiles will
+#log_rotation_age = 1d
+ # Automatic rotation of logfiles will
# happen after that (minutes)time.
# 0 disables time based rotation.
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
+#log_rotation_size = 10MB
+ # Automatic rotation of logfiles will
# happen after that much (KB) log output.
# 0 disables size based rotation.
@@ -368,10 +374,10 @@ write_function_list = ''
# Comma separated list of function names
# that write to database
# Regexp are accepted
- # If both read_only_function_list and write_function_list
- # is empty, function's volatile property is checked.
- # If it's volatile, the function is regarded as a
- # writing function.
+ # If both read_only_function_list and write_function_list
+ # is empty, function's volatile property is checked.
+ # If it's volatile, the function is regarded as a
+ # writing function.
primary_routing_query_pattern_list = ''
# Semicolon separated list of query patterns
@@ -738,7 +744,8 @@ enable_consensus_with_half_votes = off
# -- common --
-wd_monitoring_interfaces_list = '' # Comma separated list of interfaces names to monitor.
+wd_monitoring_interfaces_list = ''
+ # Comma separated list of interfaces names to monitor.
# if any interface from the list is active the watchdog will
# consider the network is fine
# 'any' to enable monitoring on all interfaces except loopback
diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
index 4b4974104..23a57aec4 100644
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -247,22 +247,26 @@ syslog_ident = 'pgpool'
# panic
# This is used when logging to stderr:
-#logging_collector = off # Enable capturing of stderr
+#logging_collector = off
+ # Enable capturing of stderr
# into log files.
# (change requires restart)
# -- Only used if logging_collector is on ---
-#log_directory = '/tmp/pgpool_log' # directory where log files are written,
+#log_directory = '/tmp/pgpool_log'
+ # directory where log files are written,
# can be absolute
#log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'
# log file name pattern,
# can include strftime() escapes
-#log_file_mode = 0600 # creation mode for log files,
+#log_file_mode = 0600
+ # creation mode for log files,
# begin with 0 to use octal notation
-#log_truncate_on_rotation = off # If on, an existing log file with the
+#log_truncate_on_rotation = off
+ # If on, an existing log file with the
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
@@ -271,10 +275,12 @@ syslog_ident = 'pgpool'
# off, meaning append to existing files
# in all cases.
-#log_rotation_age = 1d # Automatic rotation of logfiles will
+#log_rotation_age = 1d
+ # Automatic rotation of logfiles will
# happen after that (minutes)time.
# 0 disables time based rotation.
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
+#log_rotation_size = 10MB
+ # Automatic rotation of logfiles will
# happen after that much (KB) log output.
# 0 disables size based rotation.
@@ -363,10 +369,10 @@ write_function_list = ''
# Comma separated list of function names
# that write to database
# Regexp are accepted
- # If both read_only_function_list and write_function_list
- # is empty, function's volatile property is checked.
- # If it's volatile, the function is regarded as a
- # writing function.
+ # If both read_only_function_list and write_function_list
+ # is empty, function's volatile property is checked.
+ # If it's volatile, the function is regarded as a
+ # writing function.
primary_routing_query_pattern_list = ''
# Semicolon separated list of query patterns
@@ -738,7 +744,8 @@ enable_consensus_with_half_votes = off
# -- common --
-wd_monitoring_interfaces_list = '' # Comma separated list of interfaces names to monitor.
+wd_monitoring_interfaces_list = ''
+ # Comma separated list of interfaces names to monitor.
# if any interface from the list is active the watchdog will
# consider the network is fine
# 'any' to enable monitoring on all interfaces except loopback
diff --git a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony
index c6be0d1ca..674b8b4ae 100644
--- a/src/sample/pgpool.conf.sample-slony
+++ b/src/sample/pgpool.conf.sample-slony
@@ -248,22 +248,26 @@ syslog_ident = 'pgpool'
# panic
# This is used when logging to stderr:
-#logging_collector = off # Enable capturing of stderr
+#logging_collector = off
+ # Enable capturing of stderr
# into log files.
# (change requires restart)
# -- Only used if logging_collector is on ---
-#log_directory = '/tmp/pgpool_log' # directory where log files are written,
+#log_directory = '/tmp/pgpool_log'
+ # directory where log files are written,
# can be absolute
#log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'
# log file name pattern,
# can include strftime() escapes
-#log_file_mode = 0600 # creation mode for log files,
+#log_file_mode = 0600
+ # creation mode for log files,
# begin with 0 to use octal notation
-#log_truncate_on_rotation = off # If on, an existing log file with the
+#log_truncate_on_rotation = off
+ # If on, an existing log file with the
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
@@ -272,10 +276,12 @@ syslog_ident = 'pgpool'
# off, meaning append to existing files
# in all cases.
-#log_rotation_age = 1d # Automatic rotation of logfiles will
+#log_rotation_age = 1d
+ # Automatic rotation of logfiles will
# happen after that (minutes)time.
# 0 disables time based rotation.
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
+#log_rotation_size = 10MB
+ # Automatic rotation of logfiles will
# happen after that much (KB) log output.
# 0 disables size based rotation.
@@ -364,10 +370,10 @@ write_function_list = ''
# Comma separated list of function names
# that write to database
# Regexp are accepted
- # If both read_only_function_list and write_function_list
- # is empty, function's volatile property is checked.
- # If it's volatile, the function is regarded as a
- # writing function.
+ # If both read_only_function_list and write_function_list
+ # is empty, function's volatile property is checked.
+ # If it's volatile, the function is regarded as a
+ # writing function.
primary_routing_query_pattern_list = ''
# Semicolon separated list of query patterns
@@ -737,7 +743,8 @@ enable_consensus_with_half_votes = off
# -- common --
-wd_monitoring_interfaces_list = '' # Comma separated list of interfaces names to monitor.
+wd_monitoring_interfaces_list = ''
+ # Comma separated list of interfaces names to monitor.
# if any interface from the list is active the watchdog will
# consider the network is fine
# 'any' to enable monitoring on all interfaces except loopback
diff --git a/src/sample/pgpool.conf.sample-snapshot b/src/sample/pgpool.conf.sample-snapshot
index 92aef7178..c7d10191d 100644
--- a/src/sample/pgpool.conf.sample-snapshot
+++ b/src/sample/pgpool.conf.sample-snapshot
@@ -245,22 +245,26 @@ syslog_ident = 'pgpool'
# panic
# This is used when logging to stderr:
-#logging_collector = off # Enable capturing of stderr
+#logging_collector = off
+ # Enable capturing of stderr
# into log files.
# (change requires restart)
# -- Only used if logging_collector is on ---
-#log_directory = '/tmp/pgpool_log' # directory where log files are written,
+#log_directory = '/tmp/pgpool_log'
+ # directory where log files are written,
# can be absolute
#log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'
# log file name pattern,
# can include strftime() escapes
-#log_file_mode = 0600 # creation mode for log files,
+#log_file_mode = 0600
+ # creation mode for log files,
# begin with 0 to use octal notation
-#log_truncate_on_rotation = off # If on, an existing log file with the
+#log_truncate_on_rotation = off
+ # If on, an existing log file with the
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
@@ -269,10 +273,12 @@ syslog_ident = 'pgpool'
# off, meaning append to existing files
# in all cases.
-#log_rotation_age = 1d # Automatic rotation of logfiles will
+#log_rotation_age = 1d
+ # Automatic rotation of logfiles will
# happen after that (minutes)time.
# 0 disables time based rotation.
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
+#log_rotation_size = 10MB
+ # Automatic rotation of logfiles will
# happen after that much (KB) log output.
# 0 disables size based rotation.
@@ -361,10 +367,10 @@ write_function_list = ''
# Comma separated list of function names
# that write to database
# Regexp are accepted
- # If both read_only_function_list and write_function_list
- # is empty, function's volatile property is checked.
- # If it's volatile, the function is regarded as a
- # writing function.
+ # If both read_only_function_list and write_function_list
+ # is empty, function's volatile property is checked.
+ # If it's volatile, the function is regarded as a
+ # writing function.
primary_routing_query_pattern_list = ''
# Semicolon separated list of query patterns
@@ -736,7 +742,8 @@ enable_consensus_with_half_votes = off
# -- common --
-wd_monitoring_interfaces_list = '' # Comma separated list of interfaces names to monitor.
+wd_monitoring_interfaces_list = ''
+ # Comma separated list of interfaces names to monitor.
# if any interface from the list is active the watchdog will
# consider the network is fine
# 'any' to enable monitoring on all interfaces except loopback
diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index 281d8cdf1..ed350ea11 100644
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -252,22 +252,26 @@ syslog_ident = 'pgpool'
# panic
# This is used when logging to stderr:
-#logging_collector = off # Enable capturing of stderr
+#logging_collector = off
+ # Enable capturing of stderr
# into log files.
# (change requires restart)
# -- Only used if logging_collector is on ---
-#log_directory = '/tmp/pgpool_log' # directory where log files are written,
+#log_directory = '/tmp/pgpool_log'
+ # directory where log files are written,
# can be absolute
#log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'
# log file name pattern,
# can include strftime() escapes
-#log_file_mode = 0600 # creation mode for log files,
+#log_file_mode = 0600
+ # creation mode for log files,
# begin with 0 to use octal notation
-#log_truncate_on_rotation = off # If on, an existing log file with the
+#log_truncate_on_rotation = off
+ # If on, an existing log file with the
# same name as the new log file will be
# truncated rather than appended to.
# But such truncation only occurs on
@@ -276,10 +280,12 @@ syslog_ident = 'pgpool'
# off, meaning append to existing files
# in all cases.
-#log_rotation_age = 1d # Automatic rotation of logfiles will
+#log_rotation_age = 1d
+ # Automatic rotation of logfiles will
# happen after that (minutes)time.
# 0 disables time based rotation.
-#log_rotation_size = 10MB # Automatic rotation of logfiles will
+#log_rotation_size = 10MB
+ # Automatic rotation of logfiles will
# happen after that much (KB) log output.
# 0 disables size based rotation.
#------------------------------------------------------------------------------
@@ -367,10 +373,10 @@ write_function_list = ''
# Comma separated list of function names
# that write to database
# Regexp are accepted
- # If both read_only_function_list and write_function_list
- # is empty, function's volatile property is checked.
- # If it's volatile, the function is regarded as a
- # writing function.
+ # If both read_only_function_list and write_function_list
+ # is empty, function's volatile property is checked.
+ # If it's volatile, the function is regarded as a
+ # writing function.
primary_routing_query_pattern_list = ''
# Semicolon separated list of query patterns
@@ -738,7 +744,8 @@ enable_consensus_with_half_votes = off
# -- common --
-wd_monitoring_interfaces_list = '' # Comma separated list of interfaces names to monitor.
+wd_monitoring_interfaces_list = ''
+ # Comma separated list of interfaces names to monitor.
# if any interface from the list is active the watchdog will
# consider the network is fine
# 'any' to enable monitoring on all interfaces except loopback
[parent: 743a69b92d99]