Changeset 915

Timestamp:

03/15/12 14:35:08 (12 years ago)

Author:

nanardon

Message:

• revert race condition fix, seems it does not solve anything

File:

• LATMOS-Accounts/bin/la-sync-manager (modified) (1 diff)

LATMOS-Accounts/bin/la-sync-manager

@@ -79 +79 @@
     my $pid = fork;
     if ($pid == 0) {
-        local $SIG{HUP} = 'IGNORE';
         $SIG{INT} = 'DEFAULT';
         my $res = $syncm->process_module($module, $baserev);
         exit($res ? 0 : 1);
     }
-    my $done = 0;
-    my $res = 0;
-    local $SIG{CHLD} = sub {
-        my $retpid = waitpid($pid, 0);
-        if ($retpid < 0) {
-            # no such process ??
-        } elsif ($retpid) {
-            $res = $? >> 8;
-            if ($res) {
-                la_log LA_ERR, "Sync process exit with $res";
-            }
+    my $retpid;
+    while(($retpid = waitpid(-1, 0)) <= 0) {}
+    local $SIG{HUP} = 'IGNORE';
+    if ($retpid) {
+        my $res = $? >> 8;
+        if ($res) {
+            la_log LA_ERR, "Sync process exit with $res";
+            return;
         }
-        $done = 1;
-    };
-    while (!$done) {
-        sleep(1);
     }
-    return !$res;
+    return 1;
 }