Skip to content

Fixed returning log database file name instead of returning full path. #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aregtech merged 2 commits into from
Jun 16, 2025
Merged

Fixed returning log database file name instead of returning full path. #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf662c0
Fixed returning log database file name instead of returning full path.
aregtech Jun 15, 2025
59c7bd6
Fixed sending empty list of connected instances.
aregtech Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/areglogger/client/private/LoggerClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ String LoggerClient::getConfigDatabaseName(void) const
if (isSqliteEngine())
{
LogConfiguration config;
result = File::getFileFullPath(config.getDatabaseName().getString());
result = config.getDatabaseName().getString();
}

return result;
Expand Down
147 changes: 85 additions & 62 deletions framework/areglogger/client/private/ObserverMessageProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,10 @@ void ObserverMessageProcessor::notifyLogRegisterScopes(const RemoteMessage& msgR
callback(cookie, scopes, count);
}

delete[] scopes;
if (scopes != nullptr)
{
delete[] scopes;
}
}

void ObserverMessageProcessor::notifyLogUpdateScopes(const RemoteMessage& msgReceived)
Expand Down Expand Up @@ -151,7 +154,10 @@ void ObserverMessageProcessor::notifyLogUpdateScopes(const RemoteMessage& msgRec
callback(cookie, scopes, count);
}

delete[] scopes;
if (scopes != nullptr)
{
delete[] scopes;
}
}

void ObserverMessageProcessor::notifyLogMessage(const RemoteMessage& msgReceived)
Expand Down Expand Up @@ -218,59 +224,66 @@ void ObserverMessageProcessor::_clientsConnected(const RemoteMessage& msgReceive
TEArrayList< NEService::sServiceConnectedInstance > listConnected;
msgReceived >> listConnected;

if (listConnected.isEmpty() == false)
{
FuncInstancesConnect callback{ nullptr };
sLogInstance * listInstances{ nullptr };
DateTime now(DateTime::getNow());
FuncInstancesConnect callback{ nullptr };
sLogInstance* listInstances{ nullptr };
int size{ static_cast<int>(listConnected.getSize()) };

do
{
Lock lock(mLoggerClient.mLock);
if (LogObserverBase::_theLogObserver == nullptr)
{
callback = mLoggerClient.mCallbacks != nullptr ? mLoggerClient.mCallbacks->evtInstConnected : nullptr;
listInstances = new sLogInstance[listConnected.getSize()];
}

mLoggerClient.mLock.lock(NECommon::WAIT_INFINITE);

int size = static_cast<int>(listConnected.getSize());
for (int i = 0; i < size; ++i)
if (size > 0)
{
const NEService::sServiceConnectedInstance& client{ listConnected[static_cast<uint32_t>(i)] };
auto added = mLoggerClient.mInstances.addIfUnique(client.ciCookie, client, false);
if (added.second)
{
mLoggerClient.mLogDatabase.logInstanceConnected(client, now);
}
DateTime now(DateTime::getNow());
listInstances = new sLogInstance[size];

if (listInstances != nullptr)
for (int i = 0; i < size; ++i)
{
const NEService::sServiceConnectedInstance& client{ listConnected[static_cast<uint32_t>(i)] };
auto added = mLoggerClient.mInstances.addIfUnique(client.ciCookie, client, false);
if (added.second)
{
mLoggerClient.mLogDatabase.logInstanceConnected(client, now);
}

if (listInstances != nullptr)
{
sLogInstance& inst{ listInstances[i] };
inst.liSource = static_cast<uint32_t>(client.ciSource);
inst.liBitness = static_cast<uint32_t>(client.ciBitness);
inst.liCookie = client.ciCookie;
inst.liTimestamp = client.ciTimestamp;
NEString::copyString( inst.liName
NEString::copyString(inst.liName
, static_cast<NEString::CharCount>(LENGTH_NAME)
, client.ciInstance.c_str()
, static_cast<NEString::CharCount>(client.ciInstance.length()));
NEString::copyString( inst.liLocation
NEString::copyString(inst.liLocation
, static_cast<NEString::CharCount>(LENGTH_LOCATION)
, client.ciLocation.c_str()
, static_cast<NEString::CharCount>(client.ciLocation.length()));
}
}
}

mLoggerClient.mLogDatabase.commit(true);
mLoggerClient.mLock.unlock();
if (LogObserverBase::_theLogObserver != nullptr)
{
LogObserverBase::_theLogObserver->onLogInstancesConnect(listConnected.getData());
}
else if (callback != nullptr)
{
callback(listInstances, size);
mLoggerClient.mLogDatabase.commit(true);
}

} while (false);

if (LogObserverBase::_theLogObserver != nullptr)
{
LogObserverBase::_theLogObserver->onLogInstancesConnect(listConnected.getData());
}
else if (callback != nullptr)
{
callback(listInstances, size);
}

if (listInstances != nullptr)
{
delete[] listInstances;
}
}
Expand All @@ -281,52 +294,62 @@ void ObserverMessageProcessor::_clientsDisconnected(const RemoteMessage& msgRece
TEArrayList< NEService::sServiceConnectedInstance > listDisconnected;

msgReceived >> listClients;
if (listClients.isEmpty() == false)
FuncInstancesDisconnect callback{ nullptr };
ITEM_ID* listInstances{ nullptr };
int size{ static_cast<int>(listClients.getSize()) };
int count{ 0 };

do
{
FuncInstancesDisconnect callback{ nullptr };
ITEM_ID* listInstances{ nullptr };
int count{ 0 };
int size{ static_cast<int>(listClients.getSize()) };
DateTime now(DateTime::getNow());
Lock lock(mLoggerClient.mLock);

if (LogObserverBase::_theLogObserver == nullptr)
{
callback = mLoggerClient.mCallbacks != nullptr ? mLoggerClient.mCallbacks->evtInstDisconnected : nullptr;
listInstances = new ITEM_ID[size];
}

mLoggerClient.mLock.lock(NECommon::WAIT_INFINITE);
for (int i = 0; i < size; ++i)

if (size > 0)
{
const ITEM_ID& client{ listClients[static_cast<uint32_t>(i)] };
if (mLoggerClient.mInstances.contains(client))
{
const NEService::sServiceConnectedInstance& instance = mLoggerClient.mInstances.getAt(client);
listDisconnected.add(instance);
if (mLoggerClient.mInstances.removeAt(client))
{
mLoggerClient.mLogDatabase.logInstanceDisconnected(client, now);
}
DateTime now(DateTime::getNow());
listInstances = new ITEM_ID[size];

if (listInstances != nullptr)
for (int i = 0; i < size; ++i)
{
const ITEM_ID& client{ listClients[static_cast<uint32_t>(i)] };
if (mLoggerClient.mInstances.contains(client))
{
listInstances[i] = client;
++count;
const NEService::sServiceConnectedInstance& instance = mLoggerClient.mInstances.getAt(client);
listDisconnected.add(instance);
if (mLoggerClient.mInstances.removeAt(client))
{
mLoggerClient.mLogDatabase.logInstanceDisconnected(client, now);
}

if (listInstances != nullptr)
{
listInstances[i] = client;
++count;
}
}
}
}

mLoggerClient.mLogDatabase.commit(true);
mLoggerClient.mLock.unlock();
if (LogObserverBase::_theLogObserver != nullptr)
{
LogObserverBase::_theLogObserver->onLogInstancesDisconnect(listDisconnected.getData());
}
else if (callback != nullptr)
{
callback(listInstances, count);
mLoggerClient.mLogDatabase.commit(true);
}
} while (false);


if (LogObserverBase::_theLogObserver != nullptr)
{
LogObserverBase::_theLogObserver->onLogInstancesDisconnect(listDisconnected.getData());
}
else if (callback != nullptr)
{
callback(listInstances, count);
}

if (listInstances != nullptr)
{
delete[] listInstances;
}
}
Loading