--- trunk/lib/Frey/Server.pm 2008/11/19 15:35:34 456
+++ trunk/lib/Frey/Server.pm 2008/11/27 22:11:13 570
@@ -43,7 +43,9 @@
cookie_session => 'sid',
callback => \&main,
debug_level => 2,
- staticp => sub { $_[0]->url =~ m/^(static|var).*\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ },
+ staticp => sub {
+ $_[0]->url =~ m{^/+(static|var).*\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$}
+ },
);
$Module::Reload::Debug = 1; # auto if debug_level > 1
Frey::ClassLoader->new->load_all_classes();
@@ -60,16 +62,51 @@
sub main {
my ($req) = @_;
+# $req->send_headers("X-Frey-VERSION: $Frey::VERSION");
+
my $path = $req->request->url->path;
eval {
- #warn "REQUEST: $path ",dump( $req->params );
+ sub refresh {
+ my ( $url, $time ) = @_;
+ $url ||= '/';
+ $time ||= 1;
+ warn "# refresh $url";
+ qq|
+
+
+
+
+
+ Refresh $url in $time sec
+
+
+ \n\r\n\r
+ |; # XXX newlines at end are important to flush content to browser
+ }
+
+ if ( $path =~ m{/reload(.*)} ) {
- if ( $path =~ m!reload! || $req->param('reload') ) {
- warn "# reload!";
- Module::Reload->check;
- Frey::Server->new->load_config;
+ $ENV{FREY_NO_LOG} = 1;
+ my $cmd = "perl -c $0";
+ warn "# check config with $cmd";
+ if ( system($cmd) == 0 ) {
+ Frey::Server->new->load_config;
+ Module::Reload->check;
+ $req->print( refresh( $1, 1 ) );
+ warn "# reload done";
+ return;
+ } else {
+ warn "ERROR: $?";
+ }
+ $ENV{FREY_NO_LOG} = 0;
+
+ } elsif ( $path =~ m{/exit(.*)} ) {
+ # FIXME do we need some kind of check here for production? :-)
+ # ./bin/dev.sh will restart us during development
+ $req->print( refresh( $1, 2 ) );
+ exit;
}
# warn $req->request->header('User_Agent');
@@ -91,6 +128,7 @@
# shared run params
my $run = {
request_url => $req->request->url,
+ debug => 1,
};
if (
@@ -113,6 +151,8 @@
my $class = rest2class $1;
warn "# run $path -> $class $2";
$run->{format} = $3 if $3;
+ $params{request_url} = $req->request->url;
+ $req->send_headers( "X-Frey: run $class" ); # send something to browser so we don't time-out
$f = Frey::Run->new( class => $class, params => \%params, run => $2, %$run );
} elsif (
$path =~ m{/([^/]+)/?$}
@@ -125,7 +165,16 @@
}
if ( $f ) {
- $req->print( $f->html );
+ $f->clean_status;
+ $f->add_status( { request => $req } );
+ warn "## status ", dump( map { keys %$_ } $f->status );
+ my $html = $f->html;
+ die "no html output" unless $html;
+ warn "## html ",length($html)," bytes";
+ eval {
+ $req->print( $html );
+ };
+ die "can't send to wire: $@" if $@;
} else {
warn "# can't call request on nothing!";
}
@@ -149,6 +198,10 @@
send_message($req);
}
+ if ( $req->conn ) {
+ $req->conn->close;
+ warn "## close connection: $@";
+ }
}
# Here we accept a connection to the browser, and keep it open. Meanwhile we