use Time::HiRes;
use Data::Dump qw(dump);
use English;
+use Module::Refresh;
use lib 'lib';
-use CloudStore::JSON;
-use CloudStore::dedup;
+use CloudStore::Couchbase;
my $dir = $ENV{RSYNC_DIR} || '/srv/cloudstore';
my $port = $ENV{RSYNC_PORT} || 6501;
exit 1;
}
+my $store = CloudStore::Couchbase->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{
# 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
};
print "INFO: added $login = $auth_users\n";
+ my $quota = read_file "$path/quota" if -e "$path/quota";
+ chomp $quota && $quota * 1;
+ $quota ||= 100 * 1024; # Kb - XXX default quota
+
+ $store->user_set({
+ login => $login,
+ path => $path,
+ secrets => [ @secrets ],
+ quota => $quota,
+ port => $port,
+ });
+
} else {
warn "skipped $login: $!";
}
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";
kill 2, $pid;
while ( -e $pid_file ) {
- warn "waiting for rsync to die...";
+ 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!";
} 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";
}
}
+=for gearman
use Gearman::Client;
my $gearman = Gearman::Client->new;
$gearman->job_servers('127.0.0.1:4730');
+=cut
while(1) {
+ die "no rsync running" unless kill 0, rsync_running_pid;
warn "# reading log output from $log_fifo\n";
open(my $fifo, '<', $log_fifo);
while( my $line = <$fifo> ) {
- die $line if $line =~ /rsync error:/;
+ Module::Refresh->refresh;
chomp $line;
print $line, $/;
print ">>> data ",dump( \%data ) if $ENV{DEBUG};
- CloudStore::dedup::data \%data; # uses deleted json files!
-
- 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);