Merge branch 'master' of git.rot13.org:/git/cloudstore

[cloudstore.git] / rsync-piper.pl

diff --git a/rsync-piper.pl b/rsync-piper.pl
index fa9a4fb..fc05140 100755 (executable)
--- a/rsync-piper.pl
+++ b/rsync-piper.pl
@@ -56,6 +56,7 @@ if ( $ENV{SQL} ) {
 
 mkdir "$dir/var" if ! -e "$dir/var";
 
+unlink $log_fifo if -f $log_fifo;
 mkfifo $log_fifo, 0700 unless -p $log_fifo;
 
 my $rsync_config = qq{
@@ -119,7 +120,13 @@ if ( -e $pid_file ) {
        my $pid = read_file $pid_file;
        chomp($pid);
        if ( kill 0, $pid ) {
-               warn "found rsync pid $pid";
+               warn "found rsync pid $pid\n";
+               kill 2, $pid;
+               while ( -e $pid_file ) {
+                       warn "waiting for rsync to die...\n";
+                       sleep 1;
+               }
+               kill 0, $pid && die "can't kill it!";
        } else {
                unlink $pid_file;
        }
@@ -141,9 +148,11 @@ if ( ! -e $pid_file ) {
        }
 }
 
+=for gearman
 use Gearman::Client;
 my $gearman = Gearman::Client->new;
 $gearman->job_servers('127.0.0.1:4730');
+=cut
 
 while(1) {
        warn "# reading log output from $log_fifo\n";
@@ -178,7 +187,9 @@ while(1) {
 
                        my $json = CloudStore::JSON::rsync_transfer \%data;
 
+=for gearman
                        $gearman->dispatch_background( 'rsync_transfer' => $json );
+=cut
 
                }
        }