Browse Source

Handle seperation line even when combined with last line of previous log

FPC_Admin 1 year ago
parent
commit
2350b34d0f
1 changed files with 6 additions and 2 deletions
  1. 6 2
      tests/utils/dbdigest.pp

+ 6 - 2
tests/utils/dbdigest.pp

@@ -444,6 +444,8 @@ const
   UseLongLog : boolean = false;
   UseLongLog : boolean = false;
   LongLogOpenCount : longint = 0;
   LongLogOpenCount : longint = 0;
   FirstLongLogLine : boolean = true;
   FirstLongLogLine : boolean = true;
+const
+   SeparationLine = '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>';
 
 
 Function GetContentsFromLongLog(Line : String) : String;
 Function GetContentsFromLongLog(Line : String) : String;
 var
 var
@@ -459,7 +461,7 @@ begin
       if FirstLongLogLine then
       if FirstLongLogLine then
         begin
         begin
           { At start of file there is a separation line }
           { At start of file there is a separation line }
-          if (pos('>>>>>>>>>>>',S)=1) then
+          if (pos(Line,S)=0) and (pos(SeparationLine,S)>=1) then
             Readln(LongLogFile,S);
             Readln(LongLogFile,S);
           FirstLongLogLine:=false;
           FirstLongLogLine:=false;
         end;
         end;
@@ -470,10 +472,12 @@ begin
             begin
             begin
               ReadLn(LongLogFile,S);
               ReadLn(LongLogFile,S);
               { End of file marker }
               { End of file marker }
-              if eof(LongLogFile) or (pos('>>>>>>>>>>>',S)=1) then
+              if eof(LongLogFile) or (pos(SeparationLine,S)=1) then
                 exit;
                 exit;
               if length(Result)<MaxLogSize then
               if length(Result)<MaxLogSize then
                 Result:=Result+S+LineEnding;
                 Result:=Result+S+LineEnding;
+              if pos(SeparationLine,S)>1 then
+                exit;
             end;
             end;
         end
         end
       else if IsFirst then
       else if IsFirst then