diff --git a/c.rb b/c.rb index 118e17b..45b51f3 100755 --- a/c.rb +++ b/c.rb @@ -3,6 +3,10 @@ libexec = File.expand_path File.dirname( __FILE__) machine, source, destination = ARGV[0...3] +def ts + Time.now.strftime '%Y-%m-%d %H:%M:%S' +end + class IO def readall buf = '' @@ -36,13 +40,13 @@ if Process.fork tor.last.close $stdout.reopen tos.last tos.first.close - $stderr.puts( {:proc => 'c', :machine => machine, :source => source}.inspect) + $stderr.puts( {:ts => ts, :proc => 'c', :machine => machine, :source => source}.inspect) exec 'ssh', machine, 'perl', '-e', File.readall( File.join( libexec, 's.pl')).shdump, source.shdump else $stdin.reopen tos.first tos.last.close $stdout.reopen tor.last tor.first.close - $stderr.puts( {:proc => 'c', :exec => 'reciever', :destination => destination}.inspect) + $stderr.puts( {:ts => ts, :proc => 'c', :exec => 'reciever', :destination => destination}.inspect) exec 'perl', File.join( libexec, 'r.pl'), destination end diff --git a/r.pl b/r.pl index fe91195..7c690ae 100755 --- a/r.pl +++ b/r.pl @@ -2,11 +2,16 @@ use strict; use warnings; +use POSIX qw(strftime); $|++; +sub ts { + strftime '%Y-%m-%d %H:%M:%S', localtime; +} + $SIG{CLD} = sub { wait; - printf STDERR "{proc: \"r\", action: \"exit\", code: $?, error: \"child_died\"}\n"; + printf STDERR "{ts: \"".ts."\", proc: \"r\", action: \"exit\", code: $?, error: \"child_died\"}\n"; exit $?; }; @@ -18,13 +23,13 @@ sub readcmd { $data; } -chdir $ARGV[0] or die( "{proc: \"r\", error: \"cannot_chdir\", exception: \"$!\"}\n"); +chdir $ARGV[0] or die( "{ts: \"".ts."\", proc: \"r\", error: \"cannot_chdir\", exception: \"$!\"}\n"); while( my$data = readcmd) { (my$cmd, my$length) = unpack( 'nN', $data); - print STDERR "{cmd: $cmd, length: $length}\n"; + print STDERR "{ts: \"".ts."\", cmd: $cmd, length: $length}\n"; read STDIN, $data, $length; if( 1 == $cmd) { - open( F, '>>', $data) or die( "{proc: \"r\", error: \"unable_to_open_file\", message: \"Can't open file <$data>.\"}\n"); + open( F, '>>', $data) or die( "{ts: \"".ts."\", proc: \"r\", error: \"unable_to_open_file\", message: \"Can't open file <$data>.\"}\n"); my@stat = stat F; print pack( 'N', $stat[7]); } @@ -32,8 +37,8 @@ while( my$data = readcmd) { print F $data; } else { - die( "{proc: \"r\", error: \"unknown_command\", command: $cmd}\n"); + die( "{ts: \"".ts."\", proc: \"r\", error: \"unknown_command\", command: $cmd}\n"); } } -print STDERR "{proc: \"r\", exit: 0}\n"; +print STDERR "{ts: \"".ts."\", proc: \"r\", exit: 0}\n"; exit 0; diff --git a/s.pl b/s.pl index 7f53244..ef72794 100755 --- a/s.pl +++ b/s.pl @@ -2,30 +2,34 @@ use strict; #use warnings; # Old perl +use POSIX qw(strftime); $|++; +sub ts { + strftime '%Y-%m-%d %H:%M:%S', localtime; +} + my$dir = shift @ARGV; -$dir =~ /^(\/.*)\/([^\/]+)$/ or die( "{proc: \"s\", error: \"invalid_path_expression\", message: \"Path-Expression is invalid.\"}\n"); +$dir =~ /^(\/.*)\/([^\/]+)$/ or die( "{ts: \"".ts."\", proc: \"s\", error: \"invalid_path_expression\", message: \"Path-Expression is invalid.\"}\n"); ($dir, my$fexpr) = ($1, $2); -chdir( $dir) or die( "{proc: \"s\", error: \"change_directory\", value: \"$dir\", message: \"$!\"}\n"); -opendir( DH, '.') || die "{proc: \"s\", error: \"dir_not_found\", message: \"Directory not found.\"}\n"; +chdir( $dir) or die( "{ts: \"".ts."\", proc: \"s\", error: \"change_directory\", value: \"$dir\", message: \"$!\"}\n"); +opendir( DH, '.') || die "{ts: \"".ts."\", proc: \"s\", error: \"dir_not_found\", message: \"Directory not found.\"}\n"; while( my$filename = readdir( DH)) { $filename =~ /$fexpr/ or next; -f $filename or next; print pack( 'nNA*', 1, length($filename), $filename); - print STDERR "{proc: \"s\", action: \"open\", file: \"$filename\"}\n"; + print STDERR "{ts: \"".ts."\", proc: \"s\", action: \"open\", file: \"$filename\"}\n"; open F, $filename; - my( $length, $r); - read STDIN, $length, 4; # Was wenn < 4 ? + read STDIN, my$length, 4; # Was wenn < 4 ? $length = unpack 'N', $length; seek F, $length, 0; - while( read( F, $r, 2040)) { + while( read( F, my$r, 1400)) { print pack( 'nNA*', 2, length($r), $r); } - print STDERR "{proc: \"s\", action: \"close\", file: \"$filename\"}\n"; + print STDERR "{ts: \"".ts."\", proc: \"s\", action: \"close\", file: \"$filename\"}\n"; close F; } closedir DH; -print STDERR "{proc: \"s\", exit: 0}\n"; +print STDERR "{ts: \"".ts."\", proc: \"s\", exit: 0}\n"; exit( 0);