Changeset 932

Timestamp:

05/01/07 22:05:42 (3 years ago)

Author:

bradfitz

Message:

convert iostat worker over to be a ChildProcess:: subclass

Location:

trunk/server

Files:

• Makefile.PL (modified) (2 diffs)
• lib/Mogstored/ChildProcess/IOStat.pm (added)
• mogstored (modified) (2 diffs)
• mogstored-iostat (deleted)

trunk/server/Makefile.PL

@@ -12 +12 @@
 use ExtUtils::MakeMaker;
 
-my $exefiles = ["mogstored", "mogstored-iostat", "mogilefsd", "mogdbsetup", "mogautomount"];
-$exefiles = ["mogstored", "mogstored-iostat"] if exists $ENV{DANGABUILD_MOGSTOREDONLY};
+my $exefiles = ["mogstored", "mogilefsd", "mogdbsetup", "mogautomount"];
+$exefiles = ["mogstored"] if exists $ENV{DANGABUILD_MOGSTOREDONLY};
 $exefiles = ["mogilefsd"] if exists $ENV{DANGABUILD_MOGILEFSDONLY};
 
@@ -26 +26 @@
         'Perlbal'          => '1.53',  # Future: make Perlbal optional, for running mogstored
                                        # in only-monitor/usage-writeout mode.
-        'Sys::Syslog'      => 0,,
+        'Sys::Syslog'      => 0,
         'Sys::Syscall'     => '0.22',
         'Getopt::Long'     => 0,
         'Symbol'           => 0,
         'Net::Netmask'     => 0,
-        'Gearman::Server'  => 1.06,
+        'Gearman::Server'  => 1.07,
         'Gearman::Client::Async' => 0.93,
         fields            => 0,

trunk/server/mogstored

@@ -267 +267 @@
     }
 
-    close STDIN;
-    close STDOUT;
-    close STDERR;
-
-    # We may not be able to see errors beyond this point
-    open STDIN, '<', '/dev/null'       or die "Couldn't open STDIN for reading from /dev/null";
-    open STDOUT, '>&', $iostat_pipe_w  or die "Couldn't dup pipe for use as STDOUT";
-    open STDERR, '>', '/dev/null'      or die "Couldn't open STDOUT for writing to /dev/null";
-
-    $ENV{MOG_DOCROOT} = Perlbal->service('mogstored')->{docroot};
-    my $exe = $selfexe;
-    $exe =~ s/mogstored$/mogstored-iostat/ or die "$0 not what we were expecting!";
-    exec $exe;
-}
+    require Mogstored::ChildProcess::IOStat;
+    my $class = "Mogstored::ChildProcess::IOStat";
+    $class->pre_exec_init;
+    $class->exec;
+}
+
+sub Mogstored::get_iostat_writer_pipe { $iostat_pipe_w }
 
 # (runs in parent event-loop process)
@@ -312 +305 @@
 }
 
-
 # Local Variables:
 # mode: perl