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

we now use a function and are more sophisticated

Browse Source 
Refactoring part: we now use a function to generate the PID
file. Sophistication: we now check if the PID contained in the file is a
valid PID. We ignore the file if it doesn't.
This commit is contained in:
Christian Kruse
2014-01-21 16:18:15 +01:00
parent 3978ead184
commit 4496a0761e
1 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
repmgrd.c
View File

@@ -144,6 +144,8 @@ static void terminate(int retval);
static void setup_event_handlers(void); static void setup_event_handlers(void);
#endif #endif
static void check_and_create_pid_file(const char *pid_file);
#define CloseConnections() \ #define CloseConnections() \
if (PQisBusy(primaryConn) == 1) \ if (PQisBusy(primaryConn) == 1) \
(void) CancelQuery(primaryConn, local_options.master_response_timeout); \ (void) CancelQuery(primaryConn, local_options.master_response_timeout); \
@@ -257,24 +259,7 @@ main(int argc, char **argv)
if (pid_file) if (pid_file)
{ {
struct stat st; check_and_create_pid_file(pid_file);
FILE *fd;
if (stat(pid_file, &st) != -1)
{
log_err("PID file %s exists. If repmgrd is no longer alive remove the file and restart repmgrd.\n", pid_file);
exit(ERR_BAD_CONFIG);
}
fd = fopen(pid_file, "w");
if (fd == NULL)
{
log_err("Could not open PID file %s!\n", pid_file);
exit(ERR_BAD_CONFIG);
}
fprintf(fd, "%d", getpid());
fclose(fd);
} }
#ifndef WIN32 #ifndef WIN32
@@ -1371,3 +1356,48 @@ update_registration(void)
} }
PQclear(res); PQclear(res);
} }
static void
check_and_create_pid_file(const char *pid_file)
{
struct stat st;
FILE *fd;
char buff[MAXLEN];
pid_t pid;
if (stat(pid_file, &st) != -1)
{
memset(buff, 0, MAXLEN);
fd = fopen(pid_file, "r");
if (fd == NULL)
{
log_err("PID file %s exists but could not opened for reading. If repmgrd is no longer alive remove the file and restart repmgrd.\n", pid_file);
exit(ERR_BAD_CONFIG);
}
fread(buff, MAXLEN - 1, 1, fd);
fclose(fd);
pid = atoi(buff);
if (pid != 0)
{
if (kill(pid, 0) != -1)
{
log_err("PID file %s exists and seems to contain a valid PID. If repmgrd is no longer alive remove the file and restart repmgrd.\n", pid_file);
exit(ERR_BAD_CONFIG);
}
}
}
fd = fopen(pid_file, "w");
if (fd == NULL)
{
log_err("Could not open PID file %s!\n", pid_file);
exit(ERR_BAD_CONFIG);
}
fprintf(fd, "%d", getpid());
fclose(fd);
}