Skip to content

Commit 3f15354

Browse files
committed
refactor: Delete unnecessary watcher
As title. Task: https://pms.uniontech.com/task-view-381443.html
1 parent ed1ac66 commit 3f15354

File tree

5 files changed

+6
-97
lines changed

5 files changed

+6
-97
lines changed

logViewerService/assets/data/deepin-log-viewer-daemon.service

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@ InaccessiblePaths=-/etc/pam.d
2020
InaccessiblePaths=-/usr/share/uadp/
2121

2222
NoNewPrivileges=yes
23+
ReadWritePaths=-/var/log/deepin/deepin-log-viewer-service
2324
# 传参需要/home,比如导出日志到/home路径下,读取/home/$user/.cache下应用日志
2425
#ProtectHome=yes
2526
ProtectKernelTunables=yes
2627
ProtectKernelModules=yes
2728
ProtectControlGroups=yes
28-
PrivateMounts=yes
29-
PrivateTmp=yes
29+
PrivateMounts=yes
30+
# 用于接收 ops log
31+
# PrivateTmp=yes
32+
ReadWritePaths=-/tmp
3033
PrivateDevices=yes
3134
PrivateNetwork=yes
3235
RestrictNamespaces=yes

logViewerService/logviewerservice.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,7 @@ bool LogViewerService::checkAuth(const QString &actionId)
13061306

13071307
bool LogViewerService::exportOpsLog(const QString &outDir, const QString &homeDir)
13081308
{
1309+
qCDebug(logService) << "exportOpsLog for outDir:" << outDir << "and homeDir:" << homeDir;
13091310
if(!checkAuth(s_Action_Export)) {
13101311
qCDebug(logService) << "Invalid authorization for export log";
13111312
return false;

logViewerService/logviewerwatcher.cpp

Lines changed: 0 additions & 64 deletions
This file was deleted.

logViewerService/logviewerwatcher.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

logViewerService/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

55
#include "logviewerservice.h"
6-
#include "logviewerwatcher.h"
76

87
#include <DLog>
98

@@ -63,7 +62,6 @@ int main(int argc, char *argv[])
6362
qCCritical(logService) << "registerService failed:" << systemBus.lastError();
6463
exit(0x0001);
6564
}
66-
LogViewerWatcher watcher;
6765
LogViewerService service;
6866
if (!systemBus.registerObject(LogViewrPath,
6967
&service,

0 commit comments

Comments
 (0)