qdiskd: Remove pid file on clean/normal exit
PATCH 1/1 qdiskd: Remove pid file on clean/normal exit
Signed-off-by Lon Hohberger <[email protected]>
--- cman/qdisk/daemon_init.c | 19 +++++++++++++++---- cman/qdisk/main.c | 2 ++ 2 files changed, 17 insertions(+), 4 deletions(-)
cman/qdisk/daemon_init.c +15 -4
@@ -36,6 +36,7 @@ int check_process_running(char *prog, pid_t * pid);*/ static void update_pidfile (char *prog);static int setup_sigmask (void ); +static char pid_filename[PATH_MAX ];static int check_pid_valid (pid_t pid,char *prog)
@@ -148,14 +149,13 @@ update_pidfile(char *prog) {FILE *fp =NULL ;char *cmd; -char filename[PATH_MAX ]; -memset (filename,0 ,PATH_MAX ); +memset (pid_filename,0 ,PATH_MAX ); cmd =basename (prog); -snprintf (filename,sizeof (filename),"/var/run/%s.pid" , cmd); +snprintf (pid_filename,sizeof (pid_filename),"/var/run/%s.pid" , cmd); - fp =fopen (filename,"w" ); + fp =fopen (pid_filename,"w" );if (fp ==NULL ) {exit (1 ); }
@@ -225,3 +225,14 @@ daemon_init(char *prog)update_pidfile (prog); } + + +void +daemon_cleanup (void ) +{ +if (!strlen (pid_filename)) +return ; + +unlink (pid_filename); +memset (pid_filename,0 ,sizeof (pid_filename)); +}
cman/qdisk/main.c +2 -0
@@ -31,6 +31,7 @@/* from daemon_init.c */ int daemon_init (char *); +int daemon_cleanup (void );int check_process_running (char *,pid_t *);/* from proc.c */
@@ -1773,6 +1774,7 @@ out: }qd_destroy (&ctx);logt_exit (); +daemon_cleanup ();return ret; }
Signature · 1 line
1.5.6.6