Changeset 816

Timestamp:

03/03/10 23:27:06 (14 years ago)

Author:

nanardon

Message:

• ensure child process get riped

Location:

LATMOS-Accounts

Files:

• Makefile.PL (modified) (1 diff)
• bin/la-sync-manager (modified) (4 diffs)

LATMOS-Accounts/Makefile.PL

@@ -5 +5 @@
 WriteMakefile(
     NAME              => 'LATMOS::Accounts',
-    VERSION           => '0.0.18', # finds $VERSION
+    VERSION           => '0.0.19', # finds $VERSION
     PREREQ_PM         => {
         'Net::LDAP' => undef,

LATMOS-Accounts/bin/la-sync-manager

@@ -19 +19 @@
 my $pidfile = undef;
 
-$SIG{'HUP'} = sub {
-    $needsync = 1;
-    la_log LA_NOTICE, "SigHup received, synchronise now";
-};
-
 la_set_log(
     syslog => [],
@@ -43 +38 @@
     }
 }
-
-$SIG{INT} = sub {
-    unlink($pidfile) if ($pidfile);
-    exit 0;
-};
 
 if ($pidfile) {
@@ -86 +76 @@
 }
 
+$SIG{INT} = sub {
+    unlink($pidfile) if ($pidfile);
+    exit 0;
+};
+
+$SIG{'HUP'} = sub {
+    $needsync = 1;
+    la_log LA_NOTICE, "SigHup received, synchronise now";
+};
+
 while (1) {
     if ($needsync) {
@@ -93 +93 @@
             $SIG{INT} = undef;
             exit sync();
-        } else {
-            while(waitpid($pid, 0) <= 0) {}
+        }
+        my $retpid;
+        while(($retpid = waitpid(-1, 0)) <= 0) {}
+        if ($retpid) {
             my $res = $? << 8;
             if ($res) {
-               la_log LA_ERR, "Sync process exit with $res";
-           } 
+                la_log LA_ERR, "Sync process exit with $res";
+            } 
+            next;
         }
-        next;
     }