diff --git a/frameworks/native/include/hilog_common.h b/frameworks/native/include/hilog_common.h index 4cb6906946d1a10d8cab5d2e1cb49641d4c1844f..2c2ce50bf1f2f4711efc0527865586e0739a4397 100644 --- a/frameworks/native/include/hilog_common.h +++ b/frameworks/native/include/hilog_common.h @@ -23,6 +23,7 @@ #define INPUT_SOCKET SOCKET_FILE_DIR INPUT_SOCKET_NAME #define CONTROL_SOCKET_NAME "hilogControl" #define CONTROL_SOCKET SOCKET_FILE_DIR CONTROL_SOCKET_NAME +#define HLIOG_FILE_DIR "/data/log/hilog/" #define SENDIDN 0 // hilogd: reached end of log; hilogtool: exit log reading #define SENDIDA 1 // hilogd & hilogtool: normal log reading diff --git a/services/hilogd/etc/hilogd.cfg b/services/hilogd/etc/hilogd.cfg index 943642957f04669e8b89e1ce804a36e1dd57b3fa..fb3bd162cfbc005174311c2fbd49fc7b4f56583e 100644 --- a/services/hilogd/etc/hilogd.cfg +++ b/services/hilogd/etc/hilogd.cfg @@ -7,6 +7,8 @@ }, { "name" : "post-fs-data", "cmds" : [ + "mkdir /data/log/ 0770 system log", + "mkdir /data/log/hilog/ 0750 logd log" "start hilogd" ] } @@ -16,6 +18,7 @@ "path" : ["/system/bin/hilogd"], "disabled" : 1, "uid" : "logd", + "gid" : "log" "socket" : [ "hilogInput dgram 0666 logd logd passcred", "hilogControl seqpacket 0600 logd logd false" diff --git a/services/hilogd/etc/hilogd.rc b/services/hilogd/etc/hilogd.rc index 627c786c94c6fc8d0b20517f0cb69a51709e6683..8c4c736ab7112bb4bd962331cf8bb5967b191ecc 100644 --- a/services/hilogd/etc/hilogd.rc +++ b/services/hilogd/etc/hilogd.rc @@ -15,12 +15,15 @@ on early-init write /proc/sys/net/unix/max_dgram_qlen 600 on post-fs-data - mkdir /data/misc/logd/ 0770 logd logd + mkdir /data/log/ 0770 system log + mkdir /data/log/hliog/ 0750 logd logd + restorecon recursive /data/log/hilog/ start hilogd service hilogd /system/bin/hilogd disabled user logd + group log socket hilogInput dgram+passcred 0666 logd logd socket hilogControl seqpacket 0600 logd logd - seclabel u:r:logd:s0 + seclabel u:r:hilogd:s0 diff --git a/services/hilogd/log_querier.cpp b/services/hilogd/log_querier.cpp index d05fb8fc34019e0f6e2b643fbeb084e57de4245e..62ff430051dd050abe004aa9fc766d8c59f73237 100644 --- a/services/hilogd/log_querier.cpp +++ b/services/hilogd/log_querier.cpp @@ -43,7 +43,7 @@ namespace HiviewDFX { using namespace std; namespace fs = std::filesystem; constexpr int MAX_DATA_LEN = 2048; -string g_logPersisterDir = "/data/misc/logd/"; +string g_logPersisterDir = HLIOG_FILE_DIR; constexpr int DEFAULT_LOG_LEVEL = 1< 0) { g_fd = dup2(fd, fileno(stdout)); } else {