--- trunk/lib/Frey/Server.pm 2008/11/25 14:58:59 518
+++ trunk/lib/Frey/Server.pm 2008/11/26 07:58:05 533
@@ -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();
@@ -65,15 +67,17 @@
eval {
sub refresh {
- my $url = shift || '/';
+ my ( $url, $time ) = @_;
+ $url ||= '/';
+ $time ||= 1;
warn "# refresh $url";
qq|
-
+
- Refresh $url
+ Refresh $url in $time sec
\n\r\n\r
@@ -84,12 +88,12 @@
Frey::Server->new->load_config;
Module::Reload->check;
warn "# reload done";
- $req->print( refresh( $1 ) );
+ $req->print( refresh( $1, 1 ) );
return;
} 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 ) );
+ $req->print( refresh( $1, 2 ) );
exit;
}
@@ -148,9 +152,13 @@
}
if ( $f ) {
- $f->add_status( { req => $req } );
- warn "## status ", dump( map { keys %$_ } @{ $f->status } );
- $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";
+ $req->print( "$html\n" );
} else {
warn "# can't call request on nothing!";
}
@@ -174,6 +182,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