minimal stuff from fileserver

1 files changed, 8 insertions, 2 deletions

diff --git a/cron b/cron
index abe0e9b..c5b1830 100644
--- a/cron
+++ b/cron
@@ -47,7 +47,8 @@ while (defined($ThisLine = <STDIN>)) {
       # Ignore
    } elsif (
       ($ThisLine =~ s/^([^ ]+) \([^ ]+\)\s+//) or
-      ($ThisLine =~ s/^\S+\s+\S+\s+..:..:..\s+\S+\s+\S+\[(\d+)\]:\s+\((\S+)\)\s+//)
+      ($ThisLine =~ s/^\S+\s+\S+\s+..:..:..\s+\S+\s+\S+\[(\d+)\]:\s+\((\S+)\)\s+//) or
+      ($ThisLine =~ s/^\S+\s+\S+\s+..:..:..\s+\S+\s+\S+\[\d+\]:\s+//)
    ) {
       $PID  = $1;
       $User = $2;
@@ -55,7 +56,12 @@ while (defined($ThisLine = <STDIN>)) {
       if ($ThisLine =~ s/^CMD \((.+)\)\s*$/$1/) {
          $Runs->{$User}->{$ThisLine}++;
          $ExecutedCommand{$PID} = {command=>$ThisLine, user=>$User};
-      } elsif ($ThisLine =~ s/^CMD FINISH \((.+)\)\s*$/$1/) {
+      } elsif ($ThisLine =~ s/^FILE .+ USER (\S+) PID (\d+) //) {
+         $PID  = $2;
+         $User = $1;
+         $Runs->{$User}->{$ThisLine}++;
+         $ExecutedCommand{$PID} = {command=>$ThisLine, user=>$User};
+       } elsif ($ThisLine =~ s/^CMD FINISH \((.+)\)\s*$/$1/) {
          $Runs->{$User}->{$ThisLine}++;
       } elsif ($ThisLine =~ s/^(END|CMD START) \((.+)\)\s*$/$1/) {
          #Ignore for now, NetBSD users could get tricky with