1 files changed, 52 insertions, 11 deletions

diff --git a/script/bookmarks_server.pl b/script/bookmarks_server.pl
index ac117e0..1cc1e3c 100755
--- a/script/bookmarks_server.pl
+++ b/script/bookmarks_server.pl
@@ -2,7 +2,7 @@
 
 BEGIN { 
     $ENV{CATALYST_ENGINE} ||= 'HTTP';
-    $ENV{CATALYST_SCRIPT_GEN} = 4;
+    $ENV{CATALYST_SCRIPT_GEN} = 11;
 }  
 
 use strict;
@@ -10,16 +10,47 @@ use Getopt::Long;
 use Pod::Usage;
 use FindBin;
 use lib "$FindBin::Bin/../lib";
-use Bookmarks;
 
-my $help = 0;
-my $port = 3000;
-
-GetOptions( 'help|?' => \$help, 'port=s' => \$port );
+my $debug         = 0;
+my $fork          = 0;
+my $help          = 0;
+my $host          = undef;
+my $port          = 3000;
+my $restart       = 0;
+my $restart_delay = 1;
+my $restart_regex = '\.yml$|\.yaml$|\.pm$';
+
+my @argv = @ARGV;
+
+GetOptions(
+    'debug|d'           => \$debug,
+    'fork'              => \$fork,
+    'help|?'            => \$help,
+    'host=s'            => \$host,
+    'port=s'            => \$port,
+    'restart|r'         => \$restart,
+    'restartdelay|rd=s' => \$restart_delay,
+    'restartregex|rr=s' => \$restart_regex
+);
 
 pod2usage(1) if $help;
 
-Bookmarks->run($port);
+if ( $restart ) {
+    $ENV{CATALYST_ENGINE} = 'HTTP::Restarter';
+}
+if ( $debug ) {
+    $ENV{CATALYST_DEBUG} = 1;
+}
+
+require Bookmarks;
+
+Bookmarks->run( $port, $host, {
+    argv   => \@argv,
+    'fork' => $fork,
+    restart => $restart,
+    restart_delay => $restart_delay,
+    restart_regex => qr/$restart_regex/
+} );
 
 1;
 
@@ -32,8 +63,18 @@ bookmarks_server.pl - Catalyst Testserver
 bookmarks_server.pl [options]
 
  Options:
-   -? -help    display this help and exits
-   -p -port    port (defaults to 3000)
+   -d -debug          force debug mode
+   -f -fork           handle each request in a new process
+                      (defaults to false)
+   -? -help           display this help and exits
+      -host           host (defaults to all)
+   -p -port           port (defaults to 3000)
+   -r -restart        restart when files got modified
+                      (defaults to false)
+   -rd -restartdelay  delay between file checks
+   -rr -restartregex  regex match files that trigger
+                      a restart when modified
+                      (defaults to '\.yml$|\.yaml$|\.pm$')
 
  See also:
    perldoc Catalyst::Manual
@@ -51,7 +92,7 @@ Sebastian Riedel, C<sri@oook.de>
 
 Copyright 2004 Sebastian Riedel. All rights reserved.
 
-This library is free software. You can redistribute it and/or modify
-it under the same terms as perl itself.
+This library is free software, you can redistribute it and/or modify
+it under the same terms as Perl itself.
 
 =cut