Changeset 104 in bookmarks

Timestamp:

09/11/15 17:28:02 (9 years ago)

Author:

peter

Message:

• removed the separate stop script (function now handled by bkmkd stop)
• added a restart command to bkmkd

Location:

trunk/bin

Files:

• bkmkd (modified) (2 diffs)
• stop (deleted)

trunk/bin/bkmkd

@@ -21 +21 @@
 
 my %run = (
-    start => sub {
+    start   => \&_start_server,
+    stop    => \&_stop_server,
+    restart => sub {
         my $config = shift;
-        require BookmarksApp;
-        my $app = BookmarksApp->new({ config => $config })->to_app;
-
-        my $server_root = $config->{server_root} || '.';
-        my $listen      = ':' . ($config->{port} || 5000);
-        my $access_log  = catfile($server_root, 'access');
-        my $error_log   = catfile($server_root, 'errors');
-        my $pid_file    = catfile($server_root, 'pid');
-
-        my $runner = Plack::Runner->new(server => 'Starman');
-        $runner->parse_options(
-            '--daemonize',
-            '--listen',     $listen,
-            '--pid',        $pid_file,
-            '--error-log',  $error_log,
-            '--access-log', $access_log,
-        );
-        $runner->run($app);
-    },
-
-    stop => sub {
-        my $config = shift;
-        my $server_root = $config->{server_root} || '.';
-
-        my $pid_file = File::Pid->new({
-                file => catfile($server_root, 'pid'),
-            });
-
-        if (my $pid = $pid_file->running) {
-            kill 'TERM', $pid;
-        }
+        _stop_server($config);
+        _start_server($config);
     },
 );
@@ -59 +32 @@
 exists $run{$command} or die "Unrecognized command $command\n";
 $run{$command}->($config);
+
+sub _start_server {
+    my $config = shift;
+    require BookmarksApp;
+    my $app = BookmarksApp->new({ config => $config })->to_app;
+
+    my $server_root = $config->{server_root} || '.';
+    my $listen      = ':' . ($config->{port} || 5000);
+    my $access_log  = catfile($server_root, 'access');
+    my $error_log   = catfile($server_root, 'errors');
+    my $pid_file    = catfile($server_root, 'pid');
+
+    my $runner = Plack::Runner->new(server => 'Starman');
+    $runner->parse_options(
+        '--daemonize',
+        '--listen',     $listen,
+        '--pid',        $pid_file,
+        '--error-log',  $error_log,
+        '--access-log', $access_log,
+    );
+    $runner->run($app);
+}
+
+sub _stop_server {
+    my $config = shift;
+    my $server_root = $config->{server_root} || '.';
+
+    my $pid_path = catfile($server_root, 'pid');
+    unless (-e $pid_path) {
+        warn "$pid_path does not exist\n";
+        return;
+    }
+
+    my $pid_file = File::Pid->new({
+        file => $pid_path,
+    });
+
+    if (my $pid = $pid_file->running) {
+        kill 'TERM', $pid;
+    }
+}