--- trunk/lib/Frey/Server.pm 2008/11/26 00:16:30 523
+++ trunk/lib/Frey/Server.pm 2008/11/26 19:13:53 542
@@ -44,7 +44,7 @@
callback => \&main,
debug_level => 2,
staticp => sub {
- $_[0]->url =~ m{^/(static|var).*\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$}
+ $_[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
@@ -67,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
@@ -83,15 +85,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;
}
@@ -156,7 +168,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!";
}
@@ -180,7 +195,7 @@
send_message($req);
}
- if ($req->conn ) {
+ if ( $req->conn ) {
$req->conn->close;
warn "## close connection: $@";
}