Cleanup logging.

[apps/pfixtools.git] / common / common.c

diff --git a/common/common.c b/common/common.c
index 3688c9d..af95efa 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -44,11 +44,15 @@
 sig_atomic_t sigint  = false;
 sig_atomic_t sighup  = false;
 
+bool daemon_process  = true;
+int  log_level       = LOG_INFO;
+
 static FILE *pidfile = NULL;
 
 void common_sighandler(int sig)
 {
     switch (sig) {
+                       case SIGTERM:
       case SIGINT:
         sigint = true;
         return;
@@ -58,7 +62,7 @@ void common_sighandler(int sig)
         return;
 
       default:
-        syslog(LOG_ERR, "Killed (got signal %d)...", sig);
+                               err("Killed (got signal %d)...", sig);
         exit(-1);
     }
 }
@@ -193,10 +197,13 @@ int daemon_detach(void)
     open("/dev/null", O_RDWR);
 
     pid = fork();
-    if (pid < 0)
+    if (pid < 0) {
         return -1;
-    if (pid)
+               }
+    if (pid) {
+                               daemon_process = false;
         exit(0);
+               }
 
     setsid();
     return 0;
@@ -229,11 +236,20 @@ int drop_privileges(const char *user, const char *group)
 
 int pidfile_open(const char *name)
 {
+               struct flock lock;
+               p_clear(&lock, 1);
+               lock.l_type = F_WRLCK;
     if (name) {
         pidfile = fopen(name, "w");
         if (!pidfile)
             return -1;
-        fprintf(pidfile, "%d\n", getpid());
+                               if (fcntl(fileno(pidfile), F_SETLK, &lock) == -1) {
+                                               crit("program already started");
+                                               fclose(pidfile);
+                                               pidfile = NULL;
+                                               return -1;
+                               }
+                               fprintf(pidfile, "%d\n", getpid());
         return fflush(pidfile);
     }
     return 0;
@@ -252,10 +268,14 @@ int pidfile_refresh(void)
 
 static void pidfile_close(void)
 {
+               struct flock lock;
+               p_clear(&lock, 1);
+               lock.l_type = F_UNLCK;
     if (pidfile) {
         rewind(pidfile);
         ftruncate(fileno(pidfile), 0);
-        fclose(pidfile);
+        fcntl(fileno(pidfile), F_SETLK, &lock);
+                               fclose(pidfile);
         pidfile = NULL;
     }
 }
@@ -263,18 +283,18 @@ static void pidfile_close(void)
 int common_setup(const char* pidfilename, bool unsafe, const char* runas_user,
                  const char* runas_group, bool daemonize)
 {
-    if (pidfile_open(pidfilename) < 0) {
-        syslog(LOG_CRIT, "unable to write pidfile %s", pidfilename);
+    if (!unsafe && drop_privileges(runas_user, runas_group) < 0) {
+        crit("unable to drop privileges");
         return EXIT_FAILURE;
     }
 
-    if (!unsafe && drop_privileges(runas_user, runas_group) < 0) {
-        syslog(LOG_CRIT, "unable to drop privileges");
+    if (daemonize && daemon_detach() < 0) {
+        crit("unable to fork");
         return EXIT_FAILURE;
     }
 
-    if (daemonize && daemon_detach() < 0) {
-        syslog(LOG_CRIT, "unable to fork");
+               if (pidfile_open(pidfilename) < 0) {
+        crit("unable to write pidfile %s", pidfilename);
         return EXIT_FAILURE;
     }
 
@@ -287,9 +307,10 @@ extern exitcall_t __madexit[];
 
 static void common_shutdown(void)
 {
-    syslog(LOG_INFO, "Stopping...");
-    pidfile_close();
-
+               if (daemon_process) {
+                               info("stopping...");
+               }
+               pidfile_close();
     for (int i = -1; __madexit[i]; i--) {
         (*__madexit[i])();
     }