rename Couchbase to Store

[cloudstore.git] / rsync-piper.pl

diff --git a/rsync-piper.pl b/rsync-piper.pl
index 12e1e79..ed6d11b 100755 (executable)
--- a/rsync-piper.pl
+++ b/rsync-piper.pl
@@ -9,13 +9,16 @@ use IO::Select;
 use Time::HiRes;
 use Data::Dump qw(dump);
 use English;
+use Module::Refresh;
 
 use lib 'lib';
-use CloudStore::JSON;
+use WarnColor;
+use CloudStore::Store;
 
 my $dir   = $ENV{RSYNC_DIR}  || '/srv/cloudstore';
 my $port  = $ENV{RSYNC_PORT} || 6501;
 my $users = "users";
+my $default_quota = $ENV{QUOTA} || 200 * 1024; # 200 Kb for test.sh
 
 my $log_fifo = "$dir/var/$port.log";
 my $pid_file = "$dir/var/$port.pid";
@@ -26,8 +29,10 @@ $rsync = 'bin/rsync' if -x 'bin/rsync'; # use 3.1dev version!
 
 my @transfer = qw(
 timestamp:%t:timestamp
-login:%u:text
+login:%m:text
 port:$port:int
+auth:%u:text
+host:%h:text
 pid:%p:int
 perms:%B:text
 itemize:%i:text
@@ -51,8 +56,11 @@ if ( $ENV{SQL} ) {
        exit 1;
 }
 
+my $store = CloudStore::Store->new;
+
 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{
@@ -77,8 +85,8 @@ pid file  = $pid_file
 # don't check secrets file permission (uid)
 strict modes = no
 
-#pre-xfer exec = /srv/cloudstore/pre-xfer.sh
-#post-xfer exec = /srv/cloudstore/post-xfer.sh
+pre-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
+post-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
 
 };
 
@@ -88,18 +96,32 @@ foreach my $path ( glob "$users/*" ) {
        $login =~ s{^.+/([^/]+)$}{$1}; 
 
        if ( -d $path && -d "$path/blob" && -f "$path/secrets" ) {
-               print "INFO: user $login added\n";
+               my @secrets = map { chomp; $_ } read_file "$path/secrets";
+               my $auth_users = join(', ', map { s/:.+$//; $_ } @secrets );
 
                $rsync_config .= <<__RSYNC_MODULE__;
 
 [$login]
        path = $dir/users/$login/blob
-       auth users = $login
+       auth users = $auth_users
        secrets file = $dir/users/$login/secrets
        read only = false
 
 __RSYNC_MODULE__
 
+               print "INFO: added $login = $auth_users\n";
+
+               my $quota = $default_quota;
+               $quota = read_file("$path/quota") * 1 if -e "$path/quota";
+
+               $store->user_set({
+                       login => $login,
+                       path => $path,
+                       secrets => [ @secrets ],
+                       quota => $quota,
+                       port => $port,
+               });
+
        } else {
                warn "skipped $login: $!";
        }
@@ -109,16 +131,48 @@ __RSYNC_MODULE__
 write_file $cfg_file, $rsync_config;
 warn "created $cfg_file ", -s $cfg_file, " bytes\n";
 
-if ( -e $pid_file ) {
+sub rsync_running_pid {
+       return unless -e $pid_file;
        my $pid = read_file $pid_file;
        chomp($pid);
+       return $pid;
+}
+
+if ( my $pid = rsync_running_pid ) {
        if ( kill 0, $pid ) {
-               warn "found rsync pid $pid";
+               warn "found rsync pid $pid\n";
+=for kill-rsync
+               kill 2, $pid;
+               while ( -e $pid_file ) {
+                       warn "waiting for rsync to die...\n";
+                       sleep 1;
+               }
+               
+               open(my $fifo, '<', $log_fifo);
+               while ( kill 0, $pid ) {
+                       my $line = <$fifo>;
+                       warn "<<< $line\n";
+               }
+
+               kill 0, $pid && die "can't kill it!";
+=cut
        } else {
                unlink $pid_file;
        }
 }
 
+use POSIX ":sys_wait_h";
+sub REAPER {
+       my $child;
+       while ((my $waitedpid = waitpid(-1,WNOHANG)) > 0) {
+               warn "reaped $waitedpid" . ($? ? " with exit $?" : '');
+       }
+       $SIG{CHLD} = \&REAPER;  # loathe SysV
+}
+
+$SIG{CHLD} = \&REAPER;
+
+
 if ( ! -e $pid_file ) {
        my $exec = "$rsync --daemon --config $cfg_file --no-detach --port=$port";
        warn "START $exec\n";
@@ -135,20 +189,26 @@ 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";
+       die "no rsync running" unless kill 0, rsync_running_pid;
+       warn "waiting for log from $log_fifo\n";
        open(my $fifo, '<', $log_fifo);
        while( my $line = <$fifo> ) {
+               Module::Refresh->refresh;
                chomp $line;
-               print $line, $/;
+               warn $line, $/;
+
                if ( $line =~ /transfer-log:(.+)/ ) {
                        my $transfer = $1;
                        $transfer =~ s|(\d\d\d\d)/(\d\d)/(\d\d)[-\s](\d\d:\d\d:\d\d)|$1-$2-$3T$4|g;
                        my ( $yyyy,$mm,$dd,undef,$login,undef ) = split( /[\-T\|]/, $transfer, 6 );
+                       my $host = $1 if $login =~ s/\+(.+)//;
 
                        my $path = "users/$login/log";
                        mkdir $path unless -d $path;
@@ -159,17 +219,18 @@ while(1) {
                        print $log "$transfer\n";
                        close $log;
 
-
                        my @v = split(/\|/,$transfer,$#transfer + 1);
                        my %data;
                        @data{@transfer_names} = @v ; # FIXME validate?
 
                        print ">>> data ",dump( \%data ) if $ENV{DEBUG};
 
-                       my $json = CloudStore::JSON::rsync_transfer \%data;
-
+                       $store->transfer( \%data );
+=for gearman
                        $gearman->dispatch_background( 'rsync_transfer' => $json );
+=cut
 
+                       die "no rsync running" unless kill 0, rsync_running_pid;
                }
        }
        close($fifo);