--- trunk/lib/Frey/Server.pm	2008/11/18 17:12:09	421
+++ trunk/lib/Frey/Server.pm	2008/11/18 23:57:56	429
@@ -43,7 +43,7 @@
 		cookie_session => 'sid',
 		callback => \&main,
 		debug_level => 2,
-		staticp => sub { $_[0]->url =~ m/\.(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();
@@ -61,23 +61,28 @@
 	my ($req) = @_;
 
 	my $path = $req->request->url->path;
-	#warn "REQUEST: $path ",dump( $req->params );
 
-	Module::Reload->check if $path =~ m!reload! || $req->param('reload');
+	eval {
 
-#	warn $req->request->header('User_Agent');
+		#warn "REQUEST: $path ",dump( $req->params );
 
-	my %params = $req->params;
-	my $html;
+		if ( $path =~ m!reload! || $req->param('reload') ) {
+			warn "# reload!";
+			Module::Reload->check;
+			Frey::Server->new->load_config;
+		}
 
-	sub rest2class {
-		my $class = shift;
-		$class =~ s/-/::/; # sigh!
-		return $class;
-	}
+#		warn $req->request->header('User_Agent');
 
+		my %params = $req->params;
+		my $html;
+
+		sub rest2class {
+			my $class = shift;
+			$class =~ s/-/::/; # sigh!
+			return $class;
+		}
 
-	eval {
 
 		my $f;
 
@@ -128,14 +133,11 @@
 
 	};
 
-	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="frey-error">$@<pre>} );
 #		Carp::REPL::repl;
-
 	}
 
 	# If this is a request for the pushtream, then give them that