X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=common%2Fcommon.c;h=1abb148c6f6ff3b3c9034f184c277a30a872f90a;hb=146b8bb68c6280fbf701337f689f8d84b7ff1ff6;hp=c2abeb41feea8271d83b747f1bacb4f4ea62fc43;hpb=44d04c83a53af19faecb1620cf0f9ed53054da5c;p=apps%2Fpfixtools.git

diff --git a/common/common.c b/common/common.c
index c2abeb4..1abb148 100644
--- a/common/common.c
+++ b/common/common.c
@@ -45,12 +45,14 @@ 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;
@@ -60,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);
     }
 }
@@ -234,19 +236,10 @@ 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;
-				if (fcntl(fileno(pidfile), F_SETLK, &lock) == -1) {
-						syslog(LOG_ERR, "program already started");
-						fclose(pidfile);
-						pidfile = NULL;
-						return -1;
-				}
 				fprintf(pidfile, "%d\n", getpid());
         return fflush(pidfile);
     }
@@ -266,13 +259,9 @@ 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);
-        fcntl(fileno(pidfile), F_SETLK, &lock);
 				fclose(pidfile);
         pidfile = NULL;
     }
@@ -282,17 +271,17 @@ int common_setup(const char* pidfilename, bool unsafe, const char* runas_user,
                  const char* runas_group, bool daemonize)
 {
     if (!unsafe && drop_privileges(runas_user, runas_group) < 0) {
-        syslog(LOG_CRIT, "unable to drop privileges");
+        crit("unable to drop privileges");
         return EXIT_FAILURE;
     }
 
     if (daemonize && daemon_detach() < 0) {
-        syslog(LOG_CRIT, "unable to fork");
+        crit("unable to fork");
         return EXIT_FAILURE;
     }
 
 		if (pidfile_open(pidfilename) < 0) {
-        syslog(LOG_CRIT, "unable to write pidfile %s", pidfilename);
+        crit("unable to write pidfile %s", pidfilename);
         return EXIT_FAILURE;
     }
 
@@ -306,9 +295,9 @@ extern exitcall_t __madexit[];
 static void common_shutdown(void)
 {
 		if (daemon_process) {
-				syslog(LOG_INFO, "Stopping...");
+				info("stopping...");
+		    pidfile_close();
 		}
-		pidfile_close();
     for (int i = -1; __madexit[i]; i--) {
         (*__madexit[i])();
     }