From c8ed80f86085e01bf262cba3fee3bc81bdf731d3 Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Thu, 22 Oct 2020 09:57:03 +0900 Subject: ss-loggerservice branch 0.1 --- logger_service/server/src/ss_logger_util.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'logger_service/server/src/ss_logger_util.cpp') diff --git a/logger_service/server/src/ss_logger_util.cpp b/logger_service/server/src/ss_logger_util.cpp index a0467b2d..6ac72251 100644 --- a/logger_service/server/src/ss_logger_util.cpp +++ b/logger_service/server/src/ss_logger_util.cpp @@ -1,5 +1,5 @@ /* - * @copyright Copyright (c) 2016-2019 TOYOTA MOTOR CORPORATION. + * @copyright Copyright (c) 2016-2020 TOYOTA MOTOR CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ #include #include #include -//#include +#include #include #include #include @@ -835,7 +835,7 @@ std::string CLoggerUtil::GetTimeString(uint32_t f_time) { FRAMEWORKUNIFIEDLOG(ZONE_FUNC, __FUNCTION__, "+"); std::string l_ret = "00000000_000000"; struct tm local_time; -// Clock_getLocalTimeY2K38(&f_time, &local_time); + Clock_getLocalTimeY2K38(&f_time, &local_time); char buffer[20]; if (0 != strftime(buffer, sizeof(buffer), "%Y%m%d_%H%M%S", // LCOV_EXCL_BR_LINE 5: c code @@ -1019,8 +1019,8 @@ EFrameworkunifiedStatus CLoggerUtil::CopyUntyped(std::string f_source, } else if (0 != S_ISDIR(l_stat.st_mode)) { l_eStatus = CopyDirectory(f_source, f_destination); } else if (0 != S_ISLNK(l_stat.st_mode)) { - // avoid duplicate copy for eErrorEventTypeInterfaceunifiedEmmcLogs: /nv/log/awlog -> /nv/log2/awlog - if (f_source.find("/nv/log/awlog") == std::string::npos) { + // avoid duplicate copy for eErrorEventTypeInterfaceunifiedEmmcLogs: /nv/log/awlog -> /nv/BS/ss/logger_service/rwdata/log2/awlog + if (f_source.find("/nv/BS/ss/logger_service/rwdata/awlog") == std::string::npos) { l_eStatus = CopyDirectory(f_source, f_destination); } } else if (0 != S_ISREG(l_stat.st_mode)) { -- cgit 1.2.3-korg