firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:40:38 +01:00
Code Issues

Undone part of recent fix for #8151 as it prevents trace session from tracing own start as shown by failed QA tests:

Browse Source 
tests\bugs\core_3168_test.py
tests\bugs\core_3658_test.py
tests\functional\services\test_role_in_service_attachment.py
This commit is contained in:
Vlad Khorsun 2024-06-08 11:26:46 +03:00
parent 02e3213864
commit f713060b15
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/svc.cpp
View File

@ -1958,8 +1958,6 @@ void Service::start(USHORT spb_length, const UCHAR* spb_data)
Arg::Gds(isc_bad_svc_handle).raise(); Arg::Gds(isc_bad_svc_handle).raise();
} }
bool needTraceEvent = false;
try try
{ {
if (!svcShutdown) if (!svcShutdown)
@ -2098,8 +2096,6 @@ void Service::start(USHORT spb_length, const UCHAR* spb_data)
svc_status->init(); svc_status->init();
} }
needTraceEvent = svc_trace_manager->needs(ITraceFactory::TRACE_EVENT_SERVICE_START);
if (serv->serv_thd) if (serv->serv_thd)
{ {
svc_flags &= ~(SVC_evnt_fired | SVC_finished); svc_flags &= ~(SVC_evnt_fired | SVC_finished);
@ -2138,7 +2134,7 @@ void Service::start(USHORT spb_length, const UCHAR* spb_data)
} // try } // try
catch (const Firebird::Exception& ex) catch (const Firebird::Exception& ex)
{ {
if (needTraceEvent) if (svc_trace_manager->needs(ITraceFactory::TRACE_EVENT_SERVICE_START))
{ {
FbLocalStatus status_vector; FbLocalStatus status_vector;
ex.stuffException(&status_vector); ex.stuffException(&status_vector);
@ -2154,7 +2150,7 @@ void Service::start(USHORT spb_length, const UCHAR* spb_data)
throw; throw;
} }
if (needTraceEvent) if (svc_trace_manager->needs(ITraceFactory::TRACE_EVENT_SERVICE_START))
{ {
TraceServiceImpl service(this); TraceServiceImpl service(this);
this->svc_trace_manager->event_service_start(&service, this->svc_trace_manager->event_service_start(&service,