fix: [server] exit server when PrepareForShutdown emitted.

to make server exit before udisksd when shutdown/reboot. Log: as title.
linuxdeepin · May 7, 2024 · ec3fe31 · ec3fe31
1 parent 4220052
commit ec3fe31
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/plugins/server/core/serverplugin-core/core.cpp b/src/plugins/server/core/serverplugin-core/core.cpp
@@ -54,6 +54,14 @@ bool Core::start()
         DevMngIns->startMonitor();
     }
 
+    bool connected = QDBusConnection::systemBus().connect("org.freedesktop.login1",
+                                                          "/org/freedesktop/login1",
+                                                          "org.freedesktop.login1.Manager",
+                                                          "PrepareForShutdown",
+                                                          this,
+                                                          SLOT(exitOnShutdown(bool)));
+    fmDebug() << "login1::PrepareForShutdown connected:" << connected;
+
     return true;
 }
 
@@ -102,4 +110,12 @@ void Core::initOperationsDBus(QDBusConnection *connection)
     }
 }
 
+void Core::exitOnShutdown(bool shutdown)
+{
+    if (shutdown) {
+        qWarning() << "PrepareForShutdown is emitted, exit...";
+        qApp->exit(0);
+    }
+}
+
 SERVERPCORE_END_NAMESPACE
diff --git a/src/plugins/server/core/serverplugin-core/core.h b/src/plugins/server/core/serverplugin-core/core.h
@@ -29,6 +29,9 @@ class Core : public DPF_NAMESPACE::Plugin
     void initDeviceDBus(QDBusConnection *connection);
     void initOperationsDBus(QDBusConnection *connection);
 
+private Q_SLOTS:
+    void exitOnShutdown(bool);
+
 private:
     QScopedPointer<DeviceManagerDBus> deviceManager;
     QScopedPointer<OperationsStackManagerDbus> operationsStackManager;