--- trunk/lib/Frey/Server.pm 2008/11/18 23:57:56 429
+++ trunk/lib/Frey/Server.pm 2008/11/25 17:23:44 520
@@ -64,12 +64,33 @@
eval {
- #warn "REQUEST: $path ",dump( $req->params );
+ sub refresh {
+ my $url = shift || '/';
+ warn "# refresh $url";
+ qq|
+
+
+
+
+
+ Refresh $url
+
+
+ \n\r\n\r
+ |; # XXX newlines at end are important to flush content to browser
+ }
- if ( $path =~ m!reload! || $req->param('reload') ) {
- warn "# reload!";
- Module::Reload->check;
+ if ( $path =~ m{/reload(.*)} ) {
Frey::Server->new->load_config;
+ Module::Reload->check;
+ warn "# reload done";
+ $req->print( refresh( $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 ) );
+ exit;
}
# warn $req->request->header('User_Agent');
@@ -86,12 +107,12 @@
my $f;
- my $run_regexp = join('|', Frey::Run->runnable );
my $editor = Frey::Editor->new;
# shared run params
my $run = {
request_url => $req->request->url,
+ debug => 1,
};
if (
@@ -109,11 +130,12 @@
system( $editor->command( $path ) );
return;
} elsif (
- $path =~ m{/([^/]+)/($run_regexp)/?([^/]+)?}
+ $path =~ m{/([^/]+)/(as_\w+)/?([^/]+)?}
) {
my $class = rest2class $1;
warn "# run $path -> $class $2";
$run->{format} = $3 if $3;
+ $params{request_url} = $req->request->url;
$f = Frey::Run->new( class => $class, params => \%params, run => $2, %$run );
} elsif (
$path =~ m{/([^/]+)/?$}
@@ -126,7 +148,13 @@
}
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";
+ $req->print( "$html\n" );
} else {
warn "# can't call request on nothing!";
}
@@ -150,6 +178,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