Changeset 3842

Timestamp:

07/28/10 14:45:16 (2 years ago)

Author:

ligne

Message:

remove the pid file in the signal handler, rather than in the destructor. the pollers also call the destructor...

Files:

• trunk/node/lib/Munin/Node/ProxySpooler.pm (modified) (2 diffs)

trunk/node/lib/Munin/Node/ProxySpooler.pm

@@ -77 +77 @@
-        logger("Spooler caught SIG$_[0].  Shutting down");
-        kill -15, $$;
+
+        if ($self->{have_pid_file}) {
+            logger('Removing pidfile') if $config->{DEBUG};
+            unlink_pid_file($self->{pid_file});
+        }
+
-        exit 0;
-    };
@@ -110 +116 @@
-    logger('Spooler shutting down');
-    exit 0;
-}
-
-
-# tidy up on exit
-sub DESTROY
-{
-    my ($self) = @_;
-
-    if ($self->{have_pid_file}) {
-        logger('Removing pidfile');
-        unlink_pid_file($self->{pid_file});
-    }
-
-    return;
-}
-