Wed May 25 18:51:56 PDT 2005
- Previous message: [Slony1-commit] By cbbrowne: Followup to Neil's patch; it didn't have an 'elevel'
- Next message: [Slony1-commit] By cbbrowne: Need to ensure inclusion of PTHREADS libraries and flags on
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Move some of the logging from warning to debug2 level. Remove last of the unneeded elevel's and reapply SLON_WARN inplace of WARNING (this is a private function and dosn't log via PG).
Modified Files:
--------------
slony1-engine/src/slon:
confoptions.c (r1.12 -> r1.13)
-------------- next part --------------
Index: confoptions.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/confoptions.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/slon/confoptions.c -Lsrc/slon/confoptions.c -u -w -r1.12 -r1.13
--- src/slon/confoptions.c
+++ src/slon/confoptions.c
@@ -332,6 +332,7 @@
}
else
{
+ slon_log(elevel, "conf option %s not found", name);
return NULL;
}
}
@@ -377,7 +378,7 @@
{
struct config_generic *record;
- record = find_option(name, WARNING);
+ record = find_option(name, SLON_WARN);
if (record == NULL)
{
slon_log(SLON_WARN, "unrecognized configuration parameter \"%s\"\n", name);
@@ -421,9 +422,9 @@
set_config_option(const char *name, const char *value)
{
struct config_generic *record;
- int elevel = SLON_WARN;
- record = find_option(name, WARNING);
+
+ record = find_option(name, SLON_WARN);
if (record == NULL)
{
@@ -441,13 +442,13 @@
{
if (!parse_bool(value, &newval))
{
- slon_log(elevel, "parameter \"%s\" requires a Boolean value\n", name);
+ slon_log(SLON_WARN, "parameter \"%s\" requires a Boolean value\n", name);
return false;
}
}
else
{
- slon_log(elevel, "parameter \"%s\"\n", name);
+ slon_log(SLON_DEBUG2, "parameter \"%s\"\n", name);
}
*conf->variable = newval;
@@ -463,19 +464,19 @@
{
if (!parse_int(value, &newval))
{
- slon_log(elevel, "parameter \"%s\" requires a integer value\n", name);
+ slon_log(SLON_WARN, "parameter \"%s\" requires a integer value\n", name);
return false;
}
if (newval < conf->min || newval > conf->max)
{
- slon_log(elevel, "%d is outside the valid range for parameter \"%s\" (%d .. %d)\n",
+ slon_log(SLON_WARN, "%d is outside the valid range for parameter \"%s\" (%d .. %d)\n",
newval, name, conf->min, conf->max);
return false;
}
}
else
{
- slon_log(elevel, "parameter \"%s\"\n", name);
+ slon_log(SLON_DEBUG2, "parameter \"%s\"\n", name);
}
*conf->variable = newval;
break;
@@ -489,19 +490,19 @@
{
if (!parse_real(value, &newval))
{
- slon_log(elevel, "parameter \"%s\" requires a numeric value\n", name);
+ slon_log(SLON_WARN, "parameter \"%s\" requires a numeric value\n", name);
return false;
}
if (newval < conf->min || newval > conf->max)
{
- slon_log(elevel, "%g is outside the valid range for parameter \"%s\" (%g .. %g)\n",
+ slon_log(SLON_WARN, "%g is outside the valid range for parameter \"%s\" (%g .. %g)\n",
newval, name, conf->min, conf->max);
return false;
}
}
else
{
- slon_log(elevel, "parameter \"%s\"\n", name);
+ slon_log(SLON_DEBUG2, "parameter \"%s\"\n", name);
}
*conf->variable = newval;
break;
@@ -521,7 +522,7 @@
}
else
{
- slon_log(elevel, "parameter \"%s\"\n", name);
+ slon_log(SLON_DEBUG2, "parameter \"%s\"\n", name);
free(newval);
}
*conf->variable = newval;
- Previous message: [Slony1-commit] By cbbrowne: Followup to Neil's patch; it didn't have an 'elevel'
- Next message: [Slony1-commit] By cbbrowne: Need to ensure inclusion of PTHREADS libraries and flags on
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list