github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-23 23:26:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Repurpose -v/--verbose; add -t/--terse option (repmgr only)

Browse Source 
repmgr and particularly repmgrd currently produce substantial
amounts of log output. Much of this is only useful when troubleshooting
or debugging.

Previously the -v/--verbose option just forced the log level to
INFO. With repmgrd this is pretty pointless - just set the log
level in the configuration file. With repmgr the configuration
file can be overriden by the new -L/--log-level option.

-v/--verbose now provides an additional, chattier/pedantic level
of logging ("Opening *this* logfile", "Executing *this* query",
"running in *this* loop") which is helpful for understanding
repmgr/repmgrd's behaviour, particularly for troubleshooting.
What additional verbose logging is generated will of course a
also depends on the log level set, so e.g. someone trying to
work out which configuration file is actually being opened
can use '--log-level=INFO --verbose' without being bothered
by an avalanche of extra verbose debugging output.

-t/--terse option will silence certain non-essential output, at
the moment any HINTs.

Note that -v/--verbose and -t/--terse are not mutually exclusive
(suggestions for better names welcome).
This commit is contained in:
Ian Barwick
2015-11-16 13:06:32 +09:00
parent acc0ffa81f
commit 807dcc1038
4 changed files with 88 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
log.c
View File

@@ -44,6 +44,8 @@ static int detect_log_facility(const char *facility);
int log_type = REPMGR_STDERR;
int log_level = LOG_NOTICE;
int last_log_level = LOG_NOTICE;
int verbose_logging = false;
int terse_logging = false;
void
stderr_log_with_level(const char *level_name, int level, const char *fmt, ...)
@@ -79,12 +81,56 @@ log_hint(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
stderr_log_with_level("HINT", last_log_level, fmt, ap);
va_end(ap);
if (terse_logging == false)
{
va_start(ap, fmt);
stderr_log_with_level("HINT", last_log_level, fmt, ap);
va_end(ap);
}
}
void
log_verbose(int level, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
if (verbose_logging == true)
{
switch(level)
{
case LOG_EMERG:
log_emerg(fmt, ap);
break;
case LOG_ALERT:
log_alert(fmt, ap);
break;
case LOG_CRIT:
log_crit(fmt, ap);
break;
case LOG_ERR:
log_err(fmt, ap);
break;
case LOG_WARNING:
log_warning(fmt, ap);
break;
case LOG_NOTICE:
log_notice(fmt, ap);
break;
case LOG_INFO:
log_info(fmt, ap);
break;
case LOG_DEBUG:
log_debug(fmt, ap);
break;
}
}
va_end(ap);
}
bool
logger_init(t_configuration_options * opts, const char *ident, const char *level, const char *facility)
{
@@ -205,15 +251,23 @@ logger_shutdown(void)
}
/*
* Set a minimum logging level. Intended for command line verbosity
* options, which might increase requested logging over what's specified
* in the regular configuration file.
* Indicated whether extra-verbose logging is required. This will
* generate a lot of output, particularly debug logging, and should
* not be permanently enabled in production.
*
* NOTE: in previous repmgr versions, this option forced the log
* level to INFO.
*/
void
logger_min_verbose(int minimum)
logger_set_verbose(void)
{
if (log_level < minimum)
log_level = minimum;
verbose_logging = true;
}
void logger_set_terse(void)
{
terse_logging = true;
}
int