opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Again, log messages in query threads without postponing. There is a chance that this does not cause access violations, now that we don't call MainForm.SetupSynEditors in various places. Fixes issue #2716.

Browse Source
This commit is contained in:
Ansgar Becker
2012-02-15 08:03:11 +00:00
parent 535bcc3470
commit 188823dfbd
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/dbconnection.pas
View File

@ -201,12 +201,6 @@ type
TDBLogCategory = (lcInfo, lcSQL, lcUserFiredSQL, lcError, lcDebug);
TDBLogEvent = procedure(Msg: String; Category: TDBLogCategory=lcInfo; Connection: TDBConnection=nil) of object;
TDBLogItem = class(TObject)
public
Msg: String;
Category: TDBLogCategory;
end;
TDBLogQueue = TObjectList<TDBLogItem>;
TDBEvent = procedure(Connection: TDBConnection; Database: String) of object;
TDBDataTypeArray = Array of TDBDataType;
@ -220,7 +214,6 @@ type
FDatabase: String;
FAllDatabases: TStringList;
FLogPrefix: String;
FLogQueue: TDBLogQueue;
FOnLog: TDBLogEvent;
FOnConnected: TDBEvent;
FOnDatabaseChanged: TDBEvent;
@ -336,7 +329,6 @@ type
property CurrentUserHostCombination: String read GetCurrentUserHostCombination;
property LockedByThread: TThread read FLockedByThread write SetLockedByThread;
property Datatypes: TDBDataTypeArray read FDatatypes;
property LogQueue: TDBLogQueue read FLogQueue;
published
property Active: Boolean read FActive write SetActive default False;
property Database: String read FDatabase write SetDatabase;
@ -720,7 +712,6 @@ begin
FLastQueryNetworkDuration := 0;
FThreadID := 0;
FLogPrefix := '';
FLogQueue := TDBLogQueue.Create(True);
FIsUnicode := False;
FIsSSL := False;
FDatabases := TDatabaseList.Create(True);
@ -1822,15 +1813,8 @@ end;
If running a thread, log to queue and let the main thread later do logging
}
procedure TDBConnection.Log(Category: TDBLogCategory; Msg: String);
var
LogItem: TDBLogItem;
begin
if (FLockedByThread <> nil) and (FLockedByThread.ThreadID = GetCurrentThreadID) then begin
LogItem := TDBLogItem.Create;
LogItem.Msg := Msg;
LogItem.Category := Category;
FLogQueue.Add(LogItem);
end else if Assigned(FOnLog) then begin
if Assigned(FOnLog) then begin
if FLogPrefix <> '' then
Msg := '['+FLogPrefix+'] ' + Msg;
FOnLog(Msg, Category, Self);

6
source/main.pas
View File

@ -2276,15 +2276,9 @@ var
TabCaption: String;
Results: TDBQuery;
i: Integer;
LogItem: TDBLogItem;
begin
// Single query or query packet has finished
// Log postponed messages
for LogItem in Thread.Connection.LogQueue do
Thread.Connection.Log(LogItem.Category, LogItem.Msg);
Thread.Connection.LogQueue.Clear;
ShowStatusMsg('Setting up result grid(s) ...');
Tab := GetQueryTabByNumber(Thread.TabNumber);