Changeset 912

Timestamp:

04/25/07 18:48:23 (3 years ago)

Author:

bradfitz

Message:

lighttpd support

Location:

trunk/server

Files:

• CHANGES (modified) (1 diff)
• lib/Mogstored/HTTPServer.pm (modified) (2 diffs)
• lib/Mogstored/HTTPServer/Lighttpd.pm (modified) (1 diff)
• mogstored (modified) (5 diffs)

trunk/server/CHANGES

@@ +1 @@
+        * lighttpd support
+
         * abstract out the HTTP server support in mogstored, so
           mogstored isn't just a perlbal wrapper, but an anything

trunk/server/lib/Mogstored/HTTPServer.pm

@@ -7 +7 @@
     $self->{listen}   = delete $opts{listen};
     $self->{maxconns} = delete $opts{maxconns};
+    $self->{bin}      = delete $opts{bin};
     die "unknown opts" if %opts;
     return $self;
@@ -24 +25 @@
 }
 
+sub listen_port {
+    my $self = shift;
+    my $port = $self->{listen};
+    $port =~ s/^.+://;
+    die "not numeric port?" unless $port =~ /^\d+$/;
+    return $port;
+}
 
 1;

trunk/server/lib/Mogstored/HTTPServer/Lighttpd.pm

@@ -2 +2 @@
 use strict;
 use base 'Mogstored::HTTPServer';
+use File::Temp ();
 
 sub start {
-    die "TODO: start lighttpd";
+    my $self = shift;
+    my $exe = $self->{bin};
+
+    if ($exe && -x $exe) {
+        die "Provided lighttpd path $exe not valid.\n";
+    }
+    unless ($exe) {
+        my @loc = qw(/usr/local/sbin/lighttpd
+                     /usr/sbin/lighttpd
+                     /usr/local/bin/lighttpd
+                     /usr/bin/lighttpd
+                     );
+        foreach my $loc (@loc) {
+            $exe = $loc;
+            last if -x $exe;
+        }
+        unless (-x $exe) {
+            die "Can't find lighttpd in @loc\n";
+        }
+    }
+
+    my $pid = fork();
+    die "Can't fork: $!" unless defined $pid;
+
+    if ($pid) {
+        $self->{pid} = $pid;
+        Mogstored->on_pid_death($pid => sub {
+            die "lighttpd died";
+        });
+        return;
+    }
+
+    my ($fh, $filename) = File::Temp::tempfile();
+    $self->{temp_conf_file} = $filename;
+    my $portnum = $self->listen_port;
+
+    print $fh qq{
+server.document-root = "$self->{docroot}"
+server.port = $portnum
+server.modules = ( "mod_webdav" )
+webdav.activate = "enable"
+};
+
+    exec $exe, "-D", "-f", $filename;
+}
+
+sub DESTROY {
+    my $self = shift;
+    unlink $self->{temp_conf_file} if $self->{temp_conf_file};
 }
 

trunk/server/mogstored

@@ -15 +15 @@
 use IO::Socket::INET;
 use POSIX qw(WNOHANG);
-use Fcntl qw(SEEK_CUR SEEK_SET SEEK_END O_RDWR O_CREAT O_TRUNC);
 use Perlbal 1.52;
 use FindBin qw($Bin $RealScript);
@@ -45 +44 @@
 my $default_config = "/etc/mogilefs/mogstored.conf";
 my $server      = "perlbal";
+my $serverbin   = "";
 
 my %config_opts = (
@@ -55 +55 @@
                    'maxconns=i'   => \$max_conns,
                    'server=s'     => \$server,
+                   'serverbin=s'  => \$serverbin,
                    );
 usage() unless Getopt::Long::GetOptions(%config_opts);
@@ -78 +79 @@
 # start HTTP server
 my $httpsrv_class = "Mogstored::HTTPServer::" . ucfirst($server);
-my $httpsrv       = $httpsrv_class->new(listen   => $http_listen,
+my $httpsrv       = $httpsrv_class->new(
+                                        listen   => $http_listen,
                                         docroot  => $docroot,
-                                        maxconns => $max_conns);
+                                        maxconns => $max_conns,
+                                        bin      => $serverbin,
+                                        );
 $httpsrv->start;
 
@@ -169 +173 @@
 }
 
+sub Mogstored::on_pid_death {
+    my ($class, $pid, $code) = @_;
+    $on_death{$pid} = $code;
+}
+
 # returns $pid of child, if parent, else runs child.
 sub start_disk_usage_process {