diff --git a/src/rime/lever/deployment_tasks.cc b/src/rime/lever/deployment_tasks.cc index 93c671fe62..f6a84ef131 100644 --- a/src/rime/lever/deployment_tasks.cc +++ b/src/rime/lever/deployment_tasks.cc @@ -630,26 +630,21 @@ bool CleanupTrash::Run(Deployer* deployer) { } bool CleanOldLogFiles::Run(Deployer* deployer) { + bool success = true; +#ifdef RIME_ENABLE_LOGGING + if (FLAGS_logtostderr) { + return success; + } + char ymd[12] = {0}; time_t now = time(NULL); strftime(ymd, sizeof(ymd), ".%Y%m%d", localtime(&now)); string today(ymd); DLOG(INFO) << "today: " << today; - vector dirs; -#ifdef RIME_ENABLE_LOGGING -#ifdef _WIN32 - // work-around: google::GetExistingTempDirectories crashes on windows 7 - char tmp[MAX_PATH]; - if (GetTempPathA(MAX_PATH, tmp)) - dirs.push_back(tmp); -#else - google::GetExistingTempDirectories(&dirs); -#endif // _WIN32 -#endif // RIME_ENABLE_LOGGING + vector dirs = google::GetLoggingDirectories(); DLOG(INFO) << "scanning " << dirs.size() << " temp directory for log files."; - bool success = true; int removed = 0; for (auto i = dirs.cbegin(); i != dirs.cend(); ++i) { DLOG(INFO) << "temp directory: " << *i; @@ -673,6 +668,7 @@ bool CleanOldLogFiles::Run(Deployer* deployer) { if (removed != 0) { LOG(INFO) << "cleaned " << removed << " log files."; } +#endif // RIME_ENABLE_LOGGING return success; }