X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=bak-git-server.pl;h=2b223c6c55a92a42e0afd1685b28798f8aa7d034;hb=4df71e9d801a1b344952b36e9c8bdf33294c01d1;hp=a826934d669a5832e14a60f94f19c2678663ac5d;hpb=8830aaf02a5f699fbad5c5381f1803b7417fabe3;p=bak-git.git

diff --git a/bak-git-server.pl b/bak-git-server.pl
index a826934..2b223c6 100755
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -90,6 +90,11 @@ warn "dir: $dir listen: $server_ip:9001\n"
 sub pull_changes {
 	my $hostname = shift;
 	system "find $hostname -type f | sed 's,$hostname,,' > /tmp/$hostname.list";
+	if ( @_ ) {
+		open(my $files, '>>', "/tmp/$hostname.list");
+		print $files "$_\n" foreach @_;
+		close($files);
+	}
 	system "rsync -avv --files-from /tmp/$hostname.list root\@$hostname:/ $hostname/"
 }
 
@@ -99,12 +104,20 @@ while (my $client = $server->accept()) {
 	warn "<<< $line\n";
 	my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,6);
 
-	my $on_host = $1 if $rel_path =~ s/^([^:]+):(.+)$/$2/ && -e $1;
+	my $on_host = '';
+	if ( $rel_path =~ s/^([^:]+):(.+)$/$2/ ) {
+		if ( -e $1 ) {
+			$on_host = $1;
+		} else {
+			print $client "host $1 doesn't exist in backup\n";
+			next;
+		}
+	}
 	my $path = $rel_path =~ m{^/} ? $rel_path : "$pwd/$rel_path";
 
-	$message ||= '';
-	warn "$hostname [$command] $path | $message\n";
-	$message ||= "$hostname [$command] $path";
+	warn "$hostname [$command] $on_host:$path | $message\n";
+	$message ||= "$path [$command]";
+	$message = "$hostname: $message";
 
 	my $dir = $path;
 	$dir =~ s{/[^/]+$}{};
@@ -133,7 +146,7 @@ while (my $client = $server->accept()) {
 	} elsif ( $command =~ m{(diff|status|log|ch)} ) {
 		$command .= ' --stat' if $command eq 'log';
 		$command = 'log --patch-with-stat' if $command =~ m/^ch/;
-		pull_changes $hostname if $command eq 'diff';
+		pull_changes( $hostname ) if $command eq 'diff';
 		if ( $on_host ) {
 			system 'rsync', '-avv', "root\@$on_host:$path", "$on_host/$path";
 			open(my $diff, '-|', "diff -Nuw $hostname$path $on_host$path");