3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-06 04:41:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

Create PID file before the parent exits

Browse source 
Create PID file before the parent exits as systemd reads
it as soon as the parent exits.
This commit is contained in:
Stuart Pook 2017-12-21 02:48:07 +01:00
parent fcf5997e34
commit b34013f4ed
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
common/daemon.cpp
View file

@ -117,6 +117,10 @@ void Daemon::daemonize()
if (user_uid != (uid_t)-1 && user_uid != getuid() && setuid(user_uid) == -1)
throw SnapException("Failed to set user " + user_);
/// Try to lock file
if (lockf(pidFilehandle_, F_TLOCK, 0) == -1)
throw SnapException("Could not lock PID lock file \"" + pidfile_ + "\"");
/// Our process ID and Session ID
pid_t pid, sid;
@ -125,9 +129,20 @@ void Daemon::daemonize()
if (pid < 0)
exit(EXIT_FAILURE);
/// If we got a good PID, then we can exit the parent process.
/// If we got a good PID, then the parent process should only exit after
/// writing the pid else systemd is confused.
if (pid > 0)
{
char str[10];
/// Get and format PID
sprintf(str, "%d\n", pid);
/// write pid to lockfile
if (write(pidFilehandle_, str, strlen(str)) != (int)strlen(str))
throw SnapException("Could not write PID to lock file \"" + pidfile_ + "\"");
exit(EXIT_SUCCESS);
}
/// Change the file mode mask
umask(0);
@ -149,18 +164,6 @@ void Daemon::daemonize()
exit(EXIT_FAILURE);
}
/// Try to lock file
if (lockf(pidFilehandle_, F_TLOCK, 0) == -1)
throw SnapException("Could not lock PID lock file \"" + pidfile_ + "\"");
char str[10];
/// Get and format PID
sprintf(str, "%d\n", getpid());
/// write pid to lockfile
if (write(pidFilehandle_, str, strlen(str)) != (int)strlen(str))
throw SnapException("Could not write PID to lock file \"" + pidfile_ + "\"");
/// Close out the standard file descriptors
close(STDIN_FILENO);
close(STDOUT_FILENO);