Skip to content

fix: add timeout for DBus sync calls in DeviceInfo #876

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
add-uos wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −1
Open

fix: add timeout for DBus sync calls in DeviceInfo #876

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
3 changes: 2 additions & 1 deletion deepin-devicemanager/src/GenerateDevice/DBusInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bool DBusInterface::getInfo(const QString &key, QString &info)
<< "--object-path" << "/org/deepin/DeviceInfo"
<< "--method" << "org.deepin.DeviceInfo.getInfo"
<< "hwinfo");
process.waitForFinished();
process.waitForFinished(5000);
QByteArray output = process.readAllStandardOutput();
QString outputStr = QString::fromLocal8Bit(output);
qCInfo(appLog) << "getInfo gdbus out:" << outputStr.left(10); //debug detect service work is really unstable
Expand All @@ -75,5 +75,6 @@ void DBusInterface::init()

// 2. create interface
mp_Iface = new QDBusInterface(SERVICE_NAME, DEVICE_SERVICE_PATH, DEVICE_SERVICE_INTERFACE, QDBusConnection::systemBus());
mp_Iface->setTimeout(5000);
qCDebug(appLog) << "DBusInterface::init end, iface created:" << (mp_Iface != nullptr);
}
Loading