pgpool2.git / summary / log / commit / refs
commit 176a11abda984c17571f1d2b415accc81b60e121
Author: Muhammad Usama <m.usama@gmail.com>
Date: Fri Apr 14 12:46:37 2017 +0000
Removing the references of obsolete debug_level configuration parameter.
configuration parameter 'debug_level' has given way to
'log_min_messages' after the adoption of exception manager.
src/include/pool_config.h | 4 ----
src/main/main.c | 15 +++++----------
src/sample/pgpool.conf.sample | 4 ----
src/sample/pgpool.conf.sample-master-slave | 4 ----
src/sample/pgpool.conf.sample-replication | 4 ----
src/sample/pgpool.conf.sample-stream | 4 ----
src/utils/pool_process_reporting.c | 6 ------
7 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/src/include/pool_config.h b/src/include/pool_config.h
index 66c2a381f..38f4bc88f 100644
--- a/src/include/pool_config.h
+++ b/src/include/pool_config.h
@@ -210,10 +210,6 @@ typedef struct {
bool log_per_node_statement; /* logs per node detailed SQL statements */
char *lobj_lock_table; /* table name to lock for rewriting lo_creat */
- int debug_level; /* debug message verbosity level.
- * 0: no message, 1 <= : more verbose
- */
-
BackendDesc *backend_desc; /* PostgreSQL Server description. Placed on shared memory */
LOAD_BALANCE_STATUS load_balance_status[MAX_NUM_BACKENDS]; /* to remember which DB node is selected for load balancing */
diff --git a/src/main/main.c b/src/main/main.c
index e8480c686..5aa2c2fb1 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -43,6 +43,7 @@
#include "auth/pool_passwd.h"
#include "query_cache/pool_memqcache.h"
#include "watchdog/wd_utils.h"
+#include "pool_config_variables.h"
static void daemonize(void);
static int read_pid_file(void);
@@ -188,21 +189,15 @@ int main(int argc, char **argv)
mypid = getpid();
pool_init_config();
- /*
- * Init debug level with -d option value
- */
- pool_config->debug_level = debug_level;
pool_get_config(conf_file, CFGCXT_INIT);
+
/*
* Override debug level
+ * if command line -d arg is given adjust the log_min_message config variable
*/
- if (pool_config->debug_level == 0)
- pool_config->debug_level = debug_level;
-
- /* if command line -d arg is given adjust the log_min_message config variable */
- if(debug_level > 0 && pool_config->log_min_messages > DEBUG1)
- pool_config->log_min_messages = DEBUG1;
+ if(debug_level > 0 && pool_config->log_min_messages > DEBUG1)
+ set_one_config_option("log_min_messages", "DEBUG1",CFGCXT_INIT, PGC_S_ARGV, INFO);
/*
* If a non-switch argument remains, then it should be either "reload" or "stop".
diff --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
index fc7d5c8d1..d059f1c0e 100644
--- a/src/sample/pgpool.conf.sample
+++ b/src/sample/pgpool.conf.sample
@@ -179,10 +179,6 @@ syslog_ident = 'pgpool'
# - Debug -
-debug_level = 0
- # Debug message verbosity level
- # 0 means no message, 1 or more mean verbose
-
#log_error_verbosity = default # terse, default, or verbose messages
#client_min_messages = notice # values in order of decreasing detail:
diff --git a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
index 6c6d86714..dc14499ed 100644
--- a/src/sample/pgpool.conf.sample-master-slave
+++ b/src/sample/pgpool.conf.sample-master-slave
@@ -179,10 +179,6 @@ syslog_ident = 'pgpool'
# - Debug -
-debug_level = 0
- # Debug message verbosity level
- # 0 means no message, 1 or more mean verbose
-
#log_error_verbosity = default # terse, default, or verbose messages
#client_min_messages = notice # values in order of decreasing detail:
diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
index 01a7d88a4..3c273d1b0 100644
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -179,10 +179,6 @@ syslog_ident = 'pgpool'
# - Debug -
-debug_level = 0
- # Debug message verbosity level
- # 0 means no message, 1 or more mean verbose
-
#log_error_verbosity = default # terse, default, or verbose messages
#client_min_messages = notice # values in order of decreasing detail:
diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index a5ec7b6de..5fc15a312 100644
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -180,10 +180,6 @@ syslog_ident = 'pgpool'
# - Debug -
-debug_level = 0
- # Debug message verbosity level
- # 0 means no message, 1 or more mean verbose
-
#log_error_verbosity = default # terse, default, or verbose messages
#client_min_messages = notice # values in order of decreasing detail:
diff --git a/src/utils/pool_process_reporting.c b/src/utils/pool_process_reporting.c
index 21b2448fd..f9cf44b92 100644
--- a/src/utils/pool_process_reporting.c
+++ b/src/utils/pool_process_reporting.c
@@ -348,12 +348,6 @@ POOL_REPORT_CONFIG* get_config(int *nrows)
StrNCpy(status[i].desc, "syslog program ident string", POOLCONFIG_MAXDESCLEN);
i++;
- /* - Debug - */
- StrNCpy(status[i].name, "debug_level", POOLCONFIG_MAXNAMELEN);
- snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%d", pool_config->debug_level);
- StrNCpy(status[i].desc, "debug message level", POOLCONFIG_MAXDESCLEN);
- i++;
-
/* FILE LOCATIONS */
StrNCpy(status[i].name, "pid_file_name", POOLCONFIG_MAXNAMELEN);
[parent: 46b5ab37223c]