Skip to content

fix: demote DConfig warnings when meta file is not installed #588

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

Open
Ivy233 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: demote DConfig warnings when meta file is not installed #588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 38 additions & 2 deletions src/dconfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ DConfigBackend::~DConfigBackend()
}

static QString _globalAppId;

class Q_DECL_HIDDEN DConfigPrivate : public DObjectPrivate
{
public:
Expand All @@ -154,12 +155,39 @@ class Q_DECL_HIDDEN DConfigPrivate : public DObjectPrivate

virtual ~DConfigPrivate() override;

#ifndef D_DISABLE_DCONFIG
// Checks whether the meta file for this config is installed locally,
// using the same lookup logic as dde-dconfig-daemon
// (DConfigMetaImpl::metaPath). Used to distinguish "config resource
// never installed" (expected, debug-level) from real backend failures.
bool metaInstalled() const
{
DConfigFile configFile(appId, name, subpath);
return !configFile.meta()->metaPath().isEmpty();
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
}
#endif

inline bool invalid() const
{
const bool valid = backend && backend->isValid();
if (!valid)
if (!valid) {
#ifndef D_DISABLE_DCONFIG
// A missing meta file means the config resource was simply never
// installed; demote that expected case to debug output and keep
// the warning for real backend failures (meta present but the
// backend could not be created, e.g. daemon unavailable).
if (metaInstalled()) {
qCWarning(cfLog, "DConfig is invalid of appid=%s name=%s, subpath=%s",
qPrintable(appId), qPrintable(name), qPrintable(subpath));
} else {
qCDebug(cfLog, "DConfig is invalid of appid=%s name=%s, subpath=%s (meta file not installed)",
qPrintable(appId), qPrintable(name), qPrintable(subpath));
}
#else
qCWarning(cfLog, "DConfig is invalid of appid=%s name=%s, subpath=%s",
qPrintable(appId), qPrintable(name), qPrintable(subpath));
#endif
}

return !valid;
}
Expand Down Expand Up @@ -379,7 +407,15 @@ class Q_DECL_HIDDEN DBusBackend : public DConfigBackend
const QDBusObjectPath dbus_path = dbus_reply.value();
const auto path = dbus_path.path(); // 显式拷贝，避免其它线程共用systemBus连接而修改dbus数据
if (dbus_reply.isError() || path.isEmpty()) {
qCWarning(cfLog, "Can't acquire config manager. error:\"%s\"", qPrintable(dbus_reply.error().message()));
// The daemon replies with a generic Failed error for a missing
// resource, which cannot be told apart by error name; check the
// meta path locally to keep real failures visible.
if (owner->metaInstalled()) {
qCWarning(cfLog, "Can't acquire config manager. error:\"%s\"", qPrintable(dbus_reply.error().message()));
} else {
qCDebug(cfLog, "Can't acquire config manager. error:\"%s\" (meta file not installed)",
qPrintable(dbus_reply.error().message()));
}
return false;
} else {
qCDebug(cfLog, "dbus path=\"%s\"", qPrintable(path));
Expand Down
Loading