[Jifty-commit] r830 - jifty/trunk/lib/Jifty/Script

[jifty-commit at lists.jifty.org]

Author: autrijus
Date: Mon Apr 10 22:36:50 2006
New Revision: 830

Modified:
   jifty/trunk/lib/Jifty/Script/Server.pm

Log:
* Use Jifty->config->framework('Web')->{'DataDir'} instead of hard-coded
  `var/mason/` in "jifty server" auto-rmtree, as suggested by obra.

Modified: jifty/trunk/lib/Jifty/Script/Server.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Server.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Server.pm	Mon Apr 10 22:36:50 2006
@@ -43,11 +43,14 @@
 
 sub run {
     my $self = shift;
-    
+    Jifty->new();
+
     # Purge stale mason cache data
-    File::Path::rmtree(['var/mason/cache', 'var/mason/obj']) if -d 'var/mason';
+    my $data_dir = Jifty->config->framework('Web')->{'DataDir'};
+    if (-d $data_dir) {
+        File::Path::rmtree(["$data_dir/cache", "$data_dir/obj"]);
+    }
 
-    Jifty->new();
     Jifty::Server->new(port => $self->{port})->run;
 }
 1;