From aa6fa12494ebddd874992811f19b01efbd18a30c Mon Sep 17 00:00:00 2001 From: kenstir Date: Mon, 12 Oct 2015 22:35:28 -0400 Subject: [PATCH] better parsing of automated logging --- Open-ILS/src/Android/kenstir_parse_logcat.pl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/Android/kenstir_parse_logcat.pl b/Open-ILS/src/Android/kenstir_parse_logcat.pl index d8aaba6803..7a11a2873a 100644 --- a/Open-ILS/src/Android/kenstir_parse_logcat.pl +++ b/Open-ILS/src/Android/kenstir_parse_logcat.pl @@ -12,9 +12,15 @@ use JSON; my $logcat = `adb logcat -d`; my @lines = split(/\n/, $logcat); foreach my $line (@lines) { - if ($line =~ /org.opensrf.net.http.GatewayRequest.*service:(\S+) method:(\S+) result:(.*)/) { - my($svc,$method,$json) = ($1,$2,$3); - my $obj = decode_json($json); - print "$method $svc -> ", Dumper($obj); + chomp($line); + $line =~ s/\015$//; + if ($line =~ /org.opensrf.net.http.GatewayRequest\(\d+\): ([^:]+):(.+)/) { + my($key,$val) = ($1,$2); + if ($key eq 'result') { + my $obj = decode_json($val); + print "$key -> ", Dumper($obj); + } else { + print "${key}:${val}\n"; + } } } -- 2.11.0