use IO::Select;
use Time::HiRes;
use Data::Dump qw(dump);
+use English;
+
+use lib 'lib';
+use CloudStore::JSON;
+use CloudStore::dedup;
+
+my $dir = $ENV{RSYNC_DIR} || '/srv/cloudstore';
+my $port = $ENV{RSYNC_PORT} || 6501;
+my $users = "users";
+
+my $log_fifo = "$dir/var/$port.log";
+my $pid_file = "$dir/var/$port.pid";
+my $cfg_file = "$dir/var/$port.conf";
+
+my $rsync = 'rsync';
+$rsync = 'bin/rsync' if -x 'bin/rsync'; # use 3.1dev version!
+
+my @transfer = qw(
+timestamp:%t:timestamp
+login:%m:text
+port:$port:int
+auth:%u:text
+host:%h:text
+pid:%p:int
+perms:%B:text
+itemize:%i:text
+mtime:%M:timestamp
+md5:%C:text
+op:%o:text
+size:%l:int
+transfered:%b:int
+file:%f:text
+);
+
+$transfer[2] = "port:$port:int"; # expand $port
+
+my @transfer_names = map { ( split(/:/,$_,3) )[0] } @transfer;
+my $transfer_log = join('|',map { ( split(/:/,$_,3) )[1] } @transfer );
+
+if ( $ENV{SQL} ) {
+ print "CREATE TABLE rsync_transfer (\n\t",
+ join(",\n\t", map { my @m = split(/:/,$_,3); "$m[0] $m[2]" } @transfer),
+ "\n);\n";
+ exit 1;
+}
-my $dir = '/srv/cloudstore/var';
-my $log_fifo = "$dir/rsyncd.log";
-our $pid_file = "$dir/rsyncd.pid";
-my $cfg_file = "$dir/rsyncd.conf";
-my $users = "users";
-
-mkdir $dir if ! -e $dir;
-
-unlink $log_fifo if -e $log_fifo;
-mkfifo $log_fifo, 0700;
+mkdir "$dir/var" if ! -e "$dir/var";
-sub kill_rsync {
- return unless -e $pid_file;
- my $pid = read_file $pid_file;
- warn "kill_rsync $pid_file = $pid";
- kill 1, $pid && unlink $pid_file; warn "killed old rsync server using pid $pid";
-}
+mkfifo $log_fifo, 0700 unless -p $log_fifo;
my $rsync_config = qq{
use chroot = no
#max connections = 4
-lock file = $dir/rsyncd.lock
+lock file = $dir/var/$port.lock
#syslog facility = local5
log file = $log_fifo
transfer logging = yes
-log format = TRANSFER %o %u %h %a %m %l %f
+log format = transfer-log:$transfer_log
max verbosity = 5
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/pre-xfer.sh
+#post-xfer exec = /srv/cloudstore/post-xfer.sh
+
+};
+
+foreach my $path ( glob "$users/*" ) {
-[dpavlin]
- path = /srv/cloudstore/users/dpavlin/blob
- auth users = dpavlin
- secrets file = /srv/cloudstore/secrets/dpavlin
+ my $login = $path;
+ $login =~ s{^.+/([^/]+)$}{$1};
+
+ if ( -d $path && -d "$path/blob" && -f "$path/secrets" ) {
+ 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 = $auth_users
+ secrets file = $dir/users/$login/secrets
read only = false
-};
+__RSYNC_MODULE__
+
+ print "INFO: added $login = $auth_users\n";
+
+ } else {
+ warn "skipped $login: $!";
+ }
+
+}
write_file $cfg_file, $rsync_config;
warn "created $cfg_file ", -s $cfg_file, " bytes\n";
-kill_rsync;
-sub DESTROY { kill_rsync; };
-
-my $exec = "rsync --daemon --config $cfg_file --no-detach --port=6501";
+if ( -e $pid_file ) {
+ my $pid = read_file $pid_file;
+ chomp($pid);
+ if ( kill 0, $pid ) {
+ warn "found rsync pid $pid";
+ } else {
+ unlink $pid_file;
+ }
+}
-#die "could not fork\n" unless defined(my $pid = fork);
-#unless ($pid) {
-# warn "start server with $exec\n";
-# exec $exec || die $!;
-#}
+if ( ! -e $pid_file ) {
+ my $exec = "$rsync --daemon --config $cfg_file --no-detach --port=$port";
+ warn "START $exec\n";
-warn "START $exec\n";
-open(my $rsync_fd, '-|', $exec);
+ die "could not fork\n" unless defined(my $pid = fork);
+ unless ($pid) {
+ warn "start server with $exec\n";
+ exec $exec || die $!;
+ }
-while ( ! -e $pid_file ) {
- sleep 1;
+ warn "wait for pid file";
+ while ( ! -e $pid_file ) {
+ sleep 1;
+ }
}
+use Gearman::Client;
+my $gearman = Gearman::Client->new;
+$gearman->job_servers('127.0.0.1:4730');
while(1) {
warn "# reading log output from $log_fifo\n";
- open(my $log, '<', $log_fifo);
- while( my $line = <$log> ) {
- print "LINE: $line";
+ open(my $fifo, '<', $log_fifo);
+ while( my $line = <$fifo> ) {
+ die $line if $line =~ /rsync error:/;
+ chomp $line;
+ print $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;
+ $path .= "/$yyyy-$mm-$dd";
+ my $new_log = ! -e $path;
+ open( my $log, '>>', $path );
+ print $log join('|',@transfer),"\n" if $new_log; # store header
+ 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};
+
+ CloudStore::dedup::data \%data; # uses deleted json files!
+
+ my $json = CloudStore::JSON::rsync_transfer \%data;
+
+ $gearman->dispatch_background( 'rsync_transfer' => $json );
+
+ }
}
- close($log);
+ close($fifo);
sleep 1;
}
projects / cloudstore.git / blobdiff