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.

diff --git a/src/include/pool_config.h b/src/include/pool_config.h
index 66c2a381fa7f3115d65dc855393184de6ba5201c..38f4bc88ff4d333269e71f1a7d8e8d6a48a061e4 100644 (file)
--- 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 e8480c6867240e9a029fa44023fd88b472280bf8..5aa2c2fb157897a6643ab96f275a47331ece1a9c 100644 (file)
--- 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 fc7d5c8d1aa30753d2efdae5977f52c64cf24022..d059f1c0e3a41263c7cae6f4e3432bdcc91009a7 100644 (file)
--- 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 6c6d867143bf7d6684e774d337773a7c51cab9e7..dc14499ed04e7a05e4d052a9b2ff9316624da24f 100644 (file)
--- 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 01a7d88a47e9882cdc10a196a9c6253ba913eb1d..3c273d1b0ce7ee875b960430262659d2088ca10d 100644 (file)
--- 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 a5ec7b6dec9a68a91693083967656097f1bda777..5fc15a312e82f8b059dcada5951bc118c4aaad5b 100644 (file)
--- 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 21b2448fdc04cafaba5a834099ec93100198913a..f9cf44b92dc7190bf0e69b3a3e25cbd2048858f0 100644 (file)
--- 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);