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

Convert some remaining fprintf messages to logger

Browse Source
This commit is contained in:
Greg Smith
2011-06-07 00:50:46 -04:00
parent 06aecbf58a
commit 8200b68cf7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config.c
View File

@@ -23,7 +23,7 @@
#include "repmgr.h"
void
parse_config(const char* config_file, t_configuration_options* options)
parse_config(const char *config_file, t_configuration_options *options)
{
char *s, buff[MAXLINELENGTH];
char name[MAXLEN];
@@ -43,7 +43,7 @@ parse_config(const char* config_file, t_configuration_options* options)
*/
if (fp == NULL)
{
fprintf(stderr, _("Did not find the configuration file '%s', continuing\n"), config_file);
log_err(_("Did not find the configuration file '%s', continuing\n"), config_file);
return;
}
@@ -71,7 +71,7 @@ parse_config(const char* config_file, t_configuration_options* options)
else if (strcmp(name, "logfacility") == 0)
strncpy (options->logfacility, value, MAXLEN);
else
printf ("WARNING: %s/%s: Unknown name/value pair!\n", name, value);
log_warning(_("%s/%s: Unknown name/value pair!\n"), name, value);
}
/* Close file */
@@ -80,19 +80,18 @@ parse_config(const char* config_file, t_configuration_options* options)
/* Check config settings */
if (strnlen(options->cluster_name, MAXLEN)==0)
{
fprintf(stderr, "Cluster name is missing. "
"Check the configuration file.\n");
log_err(_("Cluster name is missing. Check the configuration file.\n"));
exit(ERR_BAD_CONFIG);
}
if (options->node == -1)
{
fprintf(stderr, "Node information is missing. "
"Check the configuration file.\n");
log_err(_("Node information is missing. Check the configuration file.\n"));
exit(ERR_BAD_CONFIG);
}
}
char *
trim (char *s)
{
@@ -145,3 +144,4 @@ parse_line(char *buff, char *name, char *value)
value[j] = '\0';
trim(value);
}

2
config.h
View File

@@ -33,7 +33,7 @@ typedef struct
char rsync_options[QUERY_STR_LEN];
} t_configuration_options;
void parse_config(const char* config_file, t_configuration_options* options);
void parse_config(const char *config_file, t_configuration_options *options);
void parse_line(char *buff, char *name, char *value);
char *trim(char *s);