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

repmgrd: add command line option -L/--log-level

Browse Source 
Mainly for ad-hoc debugging purposes without needing to change
the configuration file.
This commit is contained in:
Ian Barwick
2017-06-22 00:09:18 +09:00
parent 8d84732026
commit d77736329a
5 changed files with 83 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
repmgrd.c
View File

@@ -26,6 +26,9 @@ static PGconn *local_conn = NULL;
static PGconn *master_conn = NULL;
/* Collate command line errors here for friendlier reporting */
static ItemList cli_errors = { NULL, NULL };
/*
* Record receipt SIGHUP; will cause configuration file to be reread at the
* appropriate point in the main loop.
@@ -51,6 +54,7 @@ main(int argc, char **argv)
{
int optindex;
int c;
char log_level[MAXLEN] = "";
bool monitoring_history = false;
static struct option long_options[] =
@@ -67,6 +71,7 @@ main(int argc, char **argv)
{"pid-file", required_argument, NULL, 'p'},
/* logging options */
{"log-level", required_argument, NULL, 'L'},
{"verbose", no_argument, NULL, 'v'},
/* legacy options */
@@ -89,7 +94,7 @@ main(int argc, char **argv)
exit(1);
}
while ((c = getopt_long(argc, argv, "?Vf:vdp:m", long_options, &optindex)) != -1)
while ((c = getopt_long(argc, argv, "?Vf:L:vdp:m", long_options, &optindex)) != -1)
{
switch (c)
{
@@ -137,6 +142,24 @@ main(int argc, char **argv)
/* logging options */
/* -L/--log-level */
case 'L':
{
int detected_log_level = detect_log_level(optarg);
if (detected_log_level != -1)
{
strncpy(log_level, optarg, MAXLEN);
}
else
{
PQExpBufferData invalid_log_level;
initPQExpBuffer(&invalid_log_level);
appendPQExpBuffer(&invalid_log_level, _("invalid log level \"%s\" provided"), optarg);
item_list_append(&cli_errors, invalid_log_level.data);
termPQExpBuffer(&invalid_log_level);
}
break;
}
case 'v':
verbose = true;
break;
@@ -154,6 +177,19 @@ main(int argc, char **argv)
}
}
/* Exit here already if errors in command line options found */
if (cli_errors.head != NULL)
{
exit_with_cli_errors(&cli_errors);
}
/* Some configuration file items can be overriden by command line options */
/* Command-line parameter -L/--log-level overrides any setting in config file*/
if (*log_level != '\0')
{
strncpy(config_file_options.loglevel, log_level, MAXLEN);
}
/*
* Tell the logger we're a daemon - this will ensure any output logged
* before the logger is initialized will be formatted correctly
@@ -207,7 +243,7 @@ static void
daemonize_process(void)
{
char *ptr,
path[MAXLEN];
path[MAXPGPATH];
pid_t pid = fork();
int ret;
@@ -218,7 +254,8 @@ daemonize_process(void)
exit(ERR_SYS_FAILURE);
break;
case 0: /* child process */
case 0:
/* create independent session ID */
pid = setsid();
if (pid == (pid_t) -1)
{
@@ -229,20 +266,22 @@ daemonize_process(void)
/* ensure that we are no longer able to open a terminal */
pid = fork();
if (pid == -1) /* error case */
/* error case */
if (pid == -1)
{
log_error(_("error in fork():\n %s"), strerror(errno));
exit(ERR_SYS_FAILURE);
}
if (pid != 0) /* parent process */
/* parent process */
if (pid != 0)
{
exit(0);
}
/* a child just flows along */
/* child process */
memset(path, 0, MAXLEN);
memset(path, 0, MAXPGPATH);
for (ptr = config_file + strlen(config_file); ptr > config_file; --ptr)
{
@@ -257,6 +296,7 @@ daemonize_process(void)
*path = '/';
}
log_info("dir now %s", path);
ret = chdir(path);
if (ret != 0)
{