Changeset 0cbd6e9cba68eac5ff8f984acc9f8bb9a107a433 for lib

Timestamp:

04/23/10 20:07:15 (3 years ago)

Author:

Mark Harrison <mark@omniti.com>

git-committer:

Mark Harrison <mark@omniti.com> 1272053235 +0000

git-parent:

[d1526ca817ef305f15a4f6418c2699bee9663f51]

git-author:

Mark Harrison <mark@omniti.com> 1272053235 +0000

Message:

Fix for a crash when run_command tries to run a non-existent command

When a child process exits (as is the case in run_command), the DESTROY method
of Resmon::Status gets called, and lots of bad things happen (web server is
killed, shared memory gets released). This commit adds a guard to make sure we
only do these if it is the main process that exits.

git-svn-id: https://labs.omniti.com/resmon/branches/resmon2@315 8c0face9-b7db-6ec6-c4b3-d5f7145c7d55

Files:

• lib/Resmon/Status.pm (modified) (2 diffs)

lib/Resmon/Status.pm

@@ -364 +364 @@
-    $self->{http_ip} = $ip;
-
+    $self->{parent_pid} = $$;
-    $self->{child} = fork();
-    if($self->{child} == 0) {
@@ -504 +505 @@
-sub DESTROY {
-    my $self = shift;
+    # Make sure we're really the parent process
+    return if ($self->{parent_pid} != $$);
-    my $child = $self->{child};
-
+ 
-        kill 15, $child;
-        sleep 1;