Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,10 @@ License: CC0-1.0
Files: android/*
Copyright:
2018 Huang JinQun <jinqun0730@gmail.com>
License: Apache-2.0
License: Apache-2.0

# config files without inline SPDX headers
Files: src/common/config.conf
Copyright:
2023 - 2026 UnionTech Software Technology Co., Ltd.
License: GPL-3.0-or-later
2 changes: 2 additions & 0 deletions debian/dde-cooperation.install
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ usr/lib/*/libco.so*
usr/lib/*/libzrpc.so*
usr/lib/*/dde-cooperation/plugins/daemon/libdaemon-core.so
usr/share/dde-cooperation/translations/*.qm
usr/share/dde-cooperation/config.conf
usr/share/dde-cooperation-daemon/config.conf
usr/share/icons/hicolor/scalable/apps/dde-cooperation.svg
usr/share/dsg/configs/org.deepin.dde.cooperation/*.json
usr/share/applications/dde-cooperation.desktop
Expand Down
1 change: 1 addition & 0 deletions debian/deepin-data-transfer.install
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
usr/bin/deepin-data-transfer
usr/lib/*/libdata-transfer-core.so*
usr/share/deepin-data-transfer/translations/*.qm
usr/share/deepin-data-transfer/config.conf
usr/share/icons/hicolor/scalable/apps/deepin-data-transfer.svg
usr/share/applications/deepin-data-transfer.desktop
usr/share/deepin-log-viewer/deepin-log.conf.d/deepin-data-transfer.json
Expand Down
3 changes: 3 additions & 0 deletions src/apps/data-transfer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,8 @@ else()

# 日志收集配置
install(FILES res/linux/deepin-data-transfer.json DESTINATION share/deepin-log-viewer/deepin-log.conf.d)

# 日志级别配置(只读,由deb包安装)
install(FILES ${CMAKE_SOURCE_DIR}/src/common/config.conf DESTINATION share/${PROJ_NAME})
endif()

3 changes: 3 additions & 0 deletions src/apps/dde-cooperation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,7 @@ else()

# 日志收集配置
install(FILES res/linux/dde-cooperation.json DESTINATION share/deepin-log-viewer/deepin-log.conf.d)

# 日志级别配置(只读,由deb包安装)
install(FILES ${CMAKE_SOURCE_DIR}/src/common/config.conf DESTINATION share/${PROJ_NAME})
endif()
5 changes: 4 additions & 1 deletion src/common/commonutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,15 @@ void CommonUitls::initLog()
QString logConfPath = logDir();
#endif
QString configFile = logConfPath + "config.conf"; //日志级别配置
QFile file(configFile);
QSettings settings(configFile, QSettings::IniFormat);
#ifndef linux
// On Windows, create config file if not exists (logDir is user-writable)
QFile file(configFile);
if (!file.exists()) {
settings.setValue("g_minLogLevel", 2);
settings.sync();
}
#endif

#ifndef QT_DEBUG
int level = settings.value("g_minLogLevel", 2).toInt();
Expand Down
2 changes: 2 additions & 0 deletions src/common/config.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[General]
g_minLogLevel=2
5 changes: 4 additions & 1 deletion src/compat/common/commonutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,15 @@ void CommonUitls::initLog()
QString logConfPath = logDir();
#endif
QString configFile = logConfPath + "config.conf"; //日志级别配置
QFile file(configFile);
QSettings settings(configFile, QSettings::IniFormat);
#ifndef linux
// On Windows, create config file if not exists (logDir is user-writable)
QFile file(configFile);
if (!file.exists()) {
settings.setValue("g_minLogLevel", 2);
settings.sync();
}
#endif

#ifndef QT_DEBUG
int level = settings.value("g_minLogLevel", 2).toInt();
Expand Down
3 changes: 3 additions & 0 deletions src/compat/plugins/daemon/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,6 @@ install(TARGETS
${DEEPIN_DAEMON_PLUGIN_DIR}
)

# 日志级别配置(只读,由deb包安装)
install(FILES ${CMAKE_SOURCE_DIR}/src/common/config.conf DESTINATION share/dde-cooperation-daemon)

Loading