--- trunk/lib/Frey/Server.pm	2008/09/14 00:45:11	189
+++ trunk/lib/Frey/Server.pm	2008/09/14 00:45:47	190
@@ -8,7 +8,7 @@
 #use Continuity::REPL;
 use Data::Dump qw/dump/;
 
-use Carp::REPL;
+#use Carp::REPL; ## XXX it would be nice, but it breaks error reporting too much
 use Frey::ClassLoader;
 
 my @messages;    # Global (shared) list of messages
@@ -56,7 +56,7 @@
 
 sub main {
 	my ($req) = @_;
-  
+
 	my $path = $req->request->url->path;
 	warn "REQUEST: $path ",dump( $req->params ),"\n";
 
@@ -84,11 +84,13 @@
 
 	};
 
+	my $self = $req;
+
 	if ( $@ ) {
 		warn $@;
 		#$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
 		$req->print( qq{<pre class="error">$@<pre>} );
-		Carp::REPL::repl;	# FIXME if $self->debug
+#		Carp::REPL::repl;
 
 	}
 
@@ -97,10 +99,6 @@
 		pushstream($req);
 	}
 
-	if ( $path =~ m/die/ ) {
-		Carp::REPL::repl;	# FIXME if $self->debug
-	}
-
 	# If they are sending us a message, we give them a thread for that too
 	if($path =~ /sendmessage/) {
 		send_message($req);