--- trunk/lib/Frey/Server.pm 2008/11/25 17:23:44 520
+++ 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,20 +62,24 @@
sub main {
my ($req) = @_;
+# $req->send_headers("X-Frey-VERSION: $Frey::VERSION");
+
my $path = $req->request->url->path;
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
@@ -81,15 +87,25 @@
}
if ( $path =~ m{/reload(.*)} ) {
- Frey::Server->new->load_config;
- Module::Reload->check;
- warn "# reload done";
- $req->print( refresh( $1 ) );
- return;
+
+ $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 ) );
+ $req->print( refresh( $1, 2 ) );
exit;
}
@@ -136,6 +152,7 @@
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{/([^/]+)/?$}
@@ -154,7 +171,10 @@
my $html = $f->html;
die "no html output" unless $html;
warn "## html ",length($html)," bytes";
- $req->print( "$html\n" );
+ eval {
+ $req->print( $html );
+ };
+ die "can't send to wire: $@" if $@;
} else {
warn "# can't call request on nothing!";
}
@@ -178,7 +198,7 @@
send_message($req);
}
- if ($req->conn ) {
+ if ( $req->conn ) {
$req->conn->close;
warn "## close connection: $@";
}