From a542a03f8573d58694b6425d4d05e57581609337 Mon Sep 17 00:00:00 2001 From: aajwy <13051180828@163.com> Date: Fri, 18 Jun 2021 02:32:07 +0000 Subject: [PATCH 1/2] Description: persist delete F Team:OTHERS Feature or Bugfix:Bugfix Binary Source:No PrivateCode(Yes/No):No Signed-off-by: aajwy <13051180828@163.com> --- services/hilogd/log_persister.cpp | 20 +------------------- services/hilogtool/log_controller.cpp | 11 +++-------- services/hilogtool/main.cpp | 11 ++--------- 3 files changed, 6 insertions(+), 36 deletions(-) diff --git a/services/hilogd/log_persister.cpp b/services/hilogd/log_persister.cpp index b49a53e..187b6c6 100644 --- a/services/hilogd/log_persister.cpp +++ b/services/hilogd/log_persister.cpp @@ -89,25 +89,7 @@ LogPersister::~LogPersister() int LogPersister::Init() { - char cPath[PATH_MAX]; - char *realPath = realpath(path.c_str(), cPath); - if (realPath == nullptr) { - return RET_FAIL; - } - path = std::string(cPath); - if (path.rfind(g_logPersisterDir, 0) != 0) { - return RET_FAIL; - } - int nPos = path.find_last_of('/'); - if (nPos == RET_FAIL) { - return RET_FAIL; - } - mmapPath = path.substr(0, nPos) + "/." + to_string(id); - if (access(path.substr(0, nPos).c_str(), F_OK) != 0) { - if (errno == ENOENT) { - MkDirPath(path.substr(0, nPos).c_str()); - } - } + mmapPath = g_logPersisterDir + string("log_") + to_string(id); bool hit = false; const lock_guard lock(g_listMutex); for (auto it = logPersisters.begin(); it != logPersisters.end(); ++it) diff --git a/services/hilogtool/log_controller.cpp b/services/hilogtool/log_controller.cpp index d8284f2..bf3e367 100644 --- a/services/hilogtool/log_controller.cpp +++ b/services/hilogtool/log_controller.cpp @@ -372,16 +372,11 @@ int32_t LogPersistOp(SeqPacketSocketClient& controller, uint8_t msgCmd, LogPersi ->compressTypeStr); pLogPersistStartMsg->compressAlg = (logPersistParam->compressAlgStr == "") ? COMPRESS_TYPE_ZLIB : stoi( logPersistParam->compressAlgStr); - pLogPersistStartMsg->fileSize = (logPersistParam->fileSizeStr == "") ? fileSizeDefault : stoi( - logPersistParam->fileSizeStr); + pLogPersistStartMsg->fileSize = (logPersistParam->fileSizeStr == "") ? fileSizeDefault : stoi(logPersistParam + ->fileSizeStr); pLogPersistStartMsg->fileNum = (logPersistParam->fileNumStr == "") ? fileNumDefault : stoi(logPersistParam->fileNumStr); - if (logPersistParam->filePathStr == "") { - logPersistParam->filePathStr = "/data/misc/logd/log_" + to_string(time(nullptr)); - } - if (logPersistParam->filePathStr.size() > FILE_PATH_MAX_LEN) { - return RET_FAIL; - } + logPersistParam->filePathStr = "/data/misc/logd/log_" + to_string(time(nullptr)); ret += strcpy_s(pLogPersistStartMsg->filePath, FILE_PATH_MAX_LEN, logPersistParam->filePathStr.c_str()); SetMsgHead(&pLogPersistStartReq->msgHeader, msgCmd, sizeof(LogPersistStartRequest)); controller.WriteAll(msgToSend, sizeof(LogPersistStartRequest)); diff --git a/services/hilogtool/main.cpp b/services/hilogtool/main.cpp index 8645f80..8f763b7 100644 --- a/services/hilogtool/main.cpp +++ b/services/hilogtool/main.cpp @@ -78,8 +78,6 @@ static void Helper() " -e , --regex=\n" " show the logs which match the regular expression,\n" " is a regular expression.\n" - " -F , --path=\n" - " set log file path.\n" " -l , --length=\n" " set single log file size.\n" " -n , --number\n" @@ -96,7 +94,7 @@ static void Helper() " time display local time.\n" " color display colorful logs by log level.i.e. \x1B[38;5;231mVERBOSE\n" " \x1B[38;5;75mDEBUG \x1B[38;5;40mINFO \x1B[38;5;166mWARN" - " \x1B[38;5;196mERROR \x1B[38;5;226mFATAL\x1B[0m\n" + "\x1B[38;5;196mERROR \x1B[38;5;226mFATAL\x1B[0m\n" " epoch display the time from 1970/1/1.\n" " monotonic display the cpu time from bootup.\n" " usec display time by usec.\n" @@ -195,7 +193,6 @@ int HilogEntry(int argc, char* argv[]) { "compress", required_argument, nullptr, 'c' }, { "stream", required_argument, nullptr, 'm' }, { "number", required_argument, nullptr, 'n' }, - { "path", required_argument, nullptr, 'F' }, { "private", required_argument, nullptr, 'p' }, { "domain", required_argument, nullptr, 'D' }, { "tag", required_argument, nullptr, 'T' }, @@ -206,7 +203,7 @@ int HilogEntry(int argc, char* argv[]) {nullptr, 0, nullptr, 0} }; - int choice = getopt_long(argc, argv, "hxz:grsSa:v:e:t:L:G:F:l:n:j:w:c:p:k:M:D:T:b:Q:m:P:", + int choice = getopt_long(argc, argv, "hxz:grsSa:v:e:t:L:G:l:n:j:w:c:p:k:M:D:T:b:Q:m:P:", longOptions, &optIndex); if (choice == -1) { break; @@ -313,9 +310,6 @@ int HilogEntry(int argc, char* argv[]) case 'n': context.fileNumArgs = optarg; break; - case 'F': - context.filePathArgs = optarg; - break; case 'j': context.jobIdArgs = optarg; break; @@ -393,7 +387,6 @@ int HilogEntry(int argc, char* argv[]) logPersistParam.compressAlgStr = context.algorithmArgs; logPersistParam.fileSizeStr = context.fileSizeArgs; logPersistParam.fileNumStr = context.fileNumArgs; - logPersistParam.filePathStr = context.filePathArgs; logPersistParam.jobIdStr = context.jobIdArgs; if (context.logFileCtrlArgs == "start") { ret = LogPersistOp(controller, MC_REQ_LOG_PERSIST_START, &logPersistParam); -- Gitee From df63e82726cfc45e26fa7e88756a4dbd45a92f6e Mon Sep 17 00:00:00 2001 From: aajwy <13051180828@163.com> Date: Fri, 18 Jun 2021 02:41:21 +0000 Subject: [PATCH 2/2] Description: changeline Team:OTHERS Feature or Bugfix:Bugfix Binary Source:No PrivateCode(Yes/No):No Signed-off-by: aajwy <13051180828@163.com> --- services/hilogtool/log_controller.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/hilogtool/log_controller.cpp b/services/hilogtool/log_controller.cpp index bf3e367..23a2a67 100644 --- a/services/hilogtool/log_controller.cpp +++ b/services/hilogtool/log_controller.cpp @@ -372,8 +372,8 @@ int32_t LogPersistOp(SeqPacketSocketClient& controller, uint8_t msgCmd, LogPersi ->compressTypeStr); pLogPersistStartMsg->compressAlg = (logPersistParam->compressAlgStr == "") ? COMPRESS_TYPE_ZLIB : stoi( logPersistParam->compressAlgStr); - pLogPersistStartMsg->fileSize = (logPersistParam->fileSizeStr == "") ? fileSizeDefault : stoi(logPersistParam - ->fileSizeStr); + pLogPersistStartMsg->fileSize = (logPersistParam->fileSizeStr == "") ? fileSizeDefault : stoi( + logPersistParam->fileSizeStr); pLogPersistStartMsg->fileNum = (logPersistParam->fileNumStr == "") ? fileNumDefault : stoi(logPersistParam->fileNumStr); logPersistParam->filePathStr = "/data/misc/logd/log_" + to_string(time(nullptr)); -- Gitee