Skip to content
Permalink
Browse files

some fixes for undefined WITHLOG conditional

  • Loading branch information...
Arnaud Bouchez
Arnaud Bouchez committed Apr 8, 2019
1 parent c007089 commit b55f87dd9e24c4c5bd753a8bd0e4760474b1b5b6
Showing with 6 additions and 2 deletions.
  1. +4 −0 SQLite3/mORMotHttpClient.pas
  2. +1 −1 SynSQLite3.pas
  3. +1 −1 SynopseCommit.inc
@@ -699,10 +699,12 @@ function TSQLHttpClientWinSock.InternalCheckOpen: boolean;
if elapsed<500 then
wait := 100 else
wait := 1000; // checking every second is enough
{$ifdef WITHLOG}
fLogClass.Add.Log(sllTrace, 'InternalCheckOpen: % on %:% after %' +
' -> wait % and retry #% up to % seconds',
[E.ClassType,fServer,fPort,MicroSecToString(elapsed*1000),
MicroSecToString(wait*1000),retry,fConnectRetrySeconds], self);
{$endif}
sleep(wait);
end;
end;
@@ -944,9 +946,11 @@ function TSQLHttpClientRequest.InternalCheckOpen: boolean;
FreeAndNil(fRequest);
if GetTickCount64>=timeout then
exit;
{$ifdef WITHLOG}
fLogClass.Add.Log(sllTrace,
'InternalCheckOpen: % on %:% -> wait and retry up to % seconds',
[E.ClassType,fServer,fPort,fConnectRetrySeconds], self);
{$endif}
sleep(250);
end;
end;
@@ -4040,8 +4040,8 @@ procedure TSQLDataBase.ExecuteAll(const aSQL: RawUTF8);
if SQLShouldBeLogged(aSQL) then begin
log := fLog.Enter(self{$ifndef DELPHI5OROLDER},'ExecuteAll'{$endif});
log.Log(sllSQL,aSQL,self,4096);
{$endif}
end;
{$endif WITHLOG}
LockAndFlushCache; // don't trust aSQL -> assume modify -> inc(InternalState^)
try
R.ExecuteAll(DB,aSQl);
@@ -1 +1 @@
'1.18.5155'
'1.18.5156'

0 comments on commit b55f87d

Please sign in to comment.
You can’t perform that action at this time.