--- trunk/lib/Frey/Server.pm	2008/11/29 15:19:43	618
+++ trunk/lib/Frey/Server.pm	2008/11/29 17:48:54	625
@@ -2,7 +2,6 @@
 
 use Moose;
 extends 'Frey';
-with 'Frey::Web';
 with 'Frey::Config';
 
 use Continuity;
@@ -36,11 +35,15 @@
 =cut
 
 our $editor = Frey::Editor->new;
+our $port;
 
 sub run {
-	my ( $self, $port ) = @_;
+	my ( $self ) = @_;
+
+	$port = $ENV{FREY_PORT} || $self->config->{port} || 16001;
+
 	$server = Continuity->new(
-		port => $port || $self->config->{port} || 16001,
+		port => $port,
 		path_session => 1,
 		cookie_session => 'sid',
 		callback => \&main,
@@ -69,7 +72,8 @@
 
 	my $path = $req->request->url->path;
 
-	eval {
+#	eval {
+	{
 
 		if ( $path =~ m{/reload(.*)} ) {
 
@@ -117,7 +121,7 @@
 		# shared run params
 		my $run = {
 			request_url => $req->request->url,
-			debug => 1,
+#			debug => 1,
 		};
 
 		if (
@@ -141,15 +145,17 @@
 			$run->{format} = $3 if $3;
 			$params{request_url} = $req->request->url;
 			$req->print( "\r\n\r\n" ); # send something to browser so we don't time-out
-			$f = Frey::Run->new( class => $class, params => \%params, run => $2, %$run );
+			$run->{$_} = $params{$_} foreach keys %params;
+			$f = Frey::Run->new( class => $class, params => $run, run => $2, request_url => $req->request->url );
 		} elsif (
 			$path =~ m{/([^/]+)/?$}
 		) {
 			my $class = rest2class $1;
 			warn "# introspect $class";
-			$f = Frey::Run->new( class => 'Frey::Introspect', params => { class => $class }, %$run );
+			$run->{class} ||= $class;
+			$f = Frey::Run->new( class => 'Frey::Introspect', params => $run, request_url => $req->request->url );
 		} else {
-			$f = Frey::Run->new( class => 'Frey::ClassBrowser', %$run );
+			$f = Frey::Run->new( class => 'Frey::ClassBrowser', params => $run, request_url => $req->request->url );
 		}
 
 		if ( $f ) {