MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-26 06:03:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix pidfile for heavyweight threads

Browse Source
This commit is contained in:
Ron Pedde 2005-01-30 06:58:36 +00:00
parent aad77eb53d
commit ed0a9c9fb1
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/daapd.h
View File

@ -55,6 +55,7 @@ typedef struct tag_config {
int process_m3u; /**< Should we process m3u files? */ int process_m3u; /**< Should we process m3u files? */
int scan_type; /**< How hard to search mp3 files. see scan_get_mp3fileinfo() */ int scan_type; /**< How hard to search mp3 files. see scan_get_mp3fileinfo() */
int compress; /**< Should we compress? */ int compress; /**< Should we compress? */
int pid; /**< pid that will accept INT to terminate */
char *adminpassword; /**< Password to web management pages */ char *adminpassword; /**< Password to web management pages */
char *readpassword; /**< iTunes password */ char *readpassword; /**< iTunes password */
char *mp3dir; /**< root directory of the mp3 files */ char *mp3dir; /**< root directory of the mp3 files */

14
src/main.c
View File

@ -612,6 +612,7 @@ void *signal_handler(void *arg) {
config.stop=0; config.stop=0;
config.reload=0; config.reload=0;
config.pid=getpid();
DPRINTF(E_WARN,L_MAIN,"Signal handler started\n"); DPRINTF(E_WARN,L_MAIN,"Signal handler started\n");
@ -804,8 +805,8 @@ int main(int argc, char *argv[]) {
daemon_start(); daemon_start();
fprintf(pid_fp,"%d\n",getpid()); /* just to be on the safe side... */
fclose(pid_fp); config.pid=0;
} }
/* DWB: shouldn't this be done after dropping privs? */ /* DWB: shouldn't this be done after dropping privs? */
@ -824,6 +825,15 @@ int main(int argc, char *argv[]) {
DPRINTF(E_FATAL,L_MAIN,"Error starting signal handler %s\n",strerror(errno)); DPRINTF(E_FATAL,L_MAIN,"Error starting signal handler %s\n",strerror(errno));
} }
/* wait to for config.pid to be set by the signal handler */
while(!config.pid) {
sleep(1);
}
fprintf(pid_fp,"%d\n",config.pid);
fclose(pid_fp);
DPRINTF(E_LOG,L_MAIN|L_PL,"Loading playlists\n"); DPRINTF(E_LOG,L_MAIN|L_PL,"Loading playlists\n");
if(config.playlist) if(config.playlist)