Mirror-bot/quickshell
1
0 Fork 0
mirror of https://github.com/quickshell-mirror/quickshell.git synced 2026-10-29 03:05:05 +00:00
Code Issues Projects Releases Activity

core/command: allow qs log to retrieve logs of dead instances

Browse Source 
If no live instances are found matching the current config, the
youngest dead instance will be used instead.
This commit is contained in:
outfoxxed committed 2025-03-19 15:35:10 -07:00
1 parent 0662c37d67
commit eabf79ebb6
3 files changed
+28 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/paths.cpp
+14 -7
View File
@@ -262,7 +262,7 @@ void QsPaths::createLock() {
}
}
bool QsPaths::checkLock(const QString& path, InstanceLockInfo* info) {
bool QsPaths::checkLock(const QString& path, InstanceLockInfo* info, bool allowDead) {
auto file = QFile(QDir(path).filePath("instance.lock"));
if (!file.open(QFile::ReadOnly)) return false;
@@ -275,10 +275,12 @@ bool QsPaths::checkLock(const QString& path, InstanceLockInfo* info) {
};
fcntl(file.handle(), F_GETLK, &lock); // NOLINT
if (lock.l_type == F_UNLCK) return false;
auto isLocked = lock.l_type != F_UNLCK;
if (!isLocked && !allowDead) return false;
if (info) {
info->pid = lock.l_pid;
info->pid = isLocked ? lock.l_pid : -1;
auto stream = QDataStream(&file);
stream >> info->instance;
@@ -287,7 +289,7 @@ bool QsPaths::checkLock(const QString& path, InstanceLockInfo* info) {
return true;
}
QVector<InstanceLockInfo> QsPaths::collectInstances(const QString& path) {
QVector<InstanceLockInfo> QsPaths::collectInstances(const QString& path, bool fallbackDead) {
qCDebug(logPaths) << "Collecting instances from" << path;
auto instances = QVector<InstanceLockInfo>();
auto dir = QDir(path);
@@ -296,13 +298,18 @@ QVector<InstanceLockInfo> QsPaths::collectInstances(const QString& path) {
for (auto& entry: dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
auto path = dir.filePath(entry);
if (QsPaths::checkLock(path, &info)) {
qCDebug(logPaths).nospace() << "Found live instance " << info.instance.instanceId << " (pid "
if (QsPaths::checkLock(path, &info, fallbackDead)) {
if (fallbackDead && info.pid != -1) {
fallbackDead = false;
instances.clear();
}
qCDebug(logPaths).nospace() << "Found instance " << info.instance.instanceId << " (pid "
<< info.pid << ") at " << path;
instances.push_back(info);
} else {
qCDebug(logPaths) << "Skipped dead instance at" << path;
qCDebug(logPaths) << "Skipped potential instance at" << path;
}
}