forked from organicmaps/organicmaps
Removed unused file logging
If necessary, it should be implemented later by directly modifying base/logging.hpp Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk
Alexander Borsuk
parent
05dee05ebb
commit
6978e2b841
7 changed files with 0 additions and 118 deletions
|
|
@ -1,6 +1,5 @@
|
|||
#include "Framework.hpp"
|
||||
#include "map/gps_tracker.hpp"
|
||||
#include "platform/file_logging.hpp"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
|
@ -37,7 +36,6 @@ extern "C"
|
|||
if (speed > 0.0)
|
||||
info.m_speedMpS = speed;
|
||||
|
||||
LOG_MEMORY_INFO();
|
||||
if (g_framework)
|
||||
g_framework->OnLocationUpdated(info);
|
||||
GpsTracker::Instance().OnLocationUpdated(info);
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
#include "base/logging.hpp"
|
||||
|
||||
#include "platform/file_logging.hpp"
|
||||
#include "platform/settings.hpp"
|
||||
|
||||
namespace
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
#import "MapsAppDelegate.h"
|
||||
|
||||
#include "platform/file_logging.hpp"
|
||||
#include "platform/platform.hpp"
|
||||
#include "platform/settings.hpp"
|
||||
|
||||
|
||||
int main(int argc, char * argv[])
|
||||
{
|
||||
#ifdef MWM_LOG_TO_FILE
|
||||
base::SetLogMessageFn(LogMessageFile);
|
||||
#endif
|
||||
auto & p = GetPlatform();
|
||||
LOG(LINFO, ("Organic Maps started, detected CPU cores:", p.CpuCores()));
|
||||
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@ set(SRC
|
|||
downloader_defines.hpp
|
||||
downloader_utils.cpp
|
||||
downloader_utils.hpp
|
||||
file_logging.cpp
|
||||
file_logging.hpp
|
||||
get_text_by_id.cpp
|
||||
get_text_by_id.hpp
|
||||
gui_thread.hpp
|
||||
|
|
|
|||
|
|
@ -1,72 +0,0 @@
|
|||
#include "platform/file_logging.hpp"
|
||||
|
||||
#include "platform/platform.hpp"
|
||||
|
||||
#include "coding/file_writer.hpp"
|
||||
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
#include <sstream>
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace
|
||||
{
|
||||
tm * GetLocalTime()
|
||||
{
|
||||
time_t rawTime;
|
||||
time(&rawTime);
|
||||
tm * localTime = localtime(&rawTime);
|
||||
assert(localTime);
|
||||
return localTime;
|
||||
}
|
||||
}
|
||||
|
||||
void LogMessageFile(base::LogLevel level, base::SrcPoint const & srcPoint, string const & msg)
|
||||
{
|
||||
static mutex mtx;
|
||||
static unique_ptr<FileWriter> file;
|
||||
|
||||
string recordType;
|
||||
switch (level)
|
||||
{
|
||||
case LINFO: recordType.assign("INFO "); break;
|
||||
case LDEBUG: recordType.assign("DEBUG "); break;
|
||||
case LWARNING: recordType.assign("WARN "); break;
|
||||
case LERROR: recordType.assign("ERROR "); break;
|
||||
case LCRITICAL: recordType.assign("FATAL "); break;
|
||||
case NUM_LOG_LEVELS: CHECK(false, ()); break;
|
||||
}
|
||||
|
||||
lock_guard<mutex> lock(mtx);
|
||||
|
||||
if (file == nullptr)
|
||||
{
|
||||
if (GetPlatform().WritableDir().empty())
|
||||
return;
|
||||
tm * curTimeTM = GetLocalTime();
|
||||
stringstream fileName;
|
||||
fileName << "logging_" << curTimeTM->tm_year + 1900 << "_" << curTimeTM->tm_mon + 1 << "_" << curTimeTM->tm_mday << "_"
|
||||
<< curTimeTM->tm_hour << "_" << curTimeTM->tm_min << "_" << curTimeTM->tm_sec << ".log";
|
||||
file.reset(new FileWriter(GetPlatform().WritablePathForFile(fileName.str())));
|
||||
}
|
||||
|
||||
string srcString = recordType + DebugPrint(srcPoint) + " " + msg + "\n";
|
||||
|
||||
file->Write(srcString.c_str(), srcString.size());
|
||||
file->Flush();
|
||||
}
|
||||
|
||||
void LogMemoryInfo()
|
||||
{
|
||||
static unsigned long counter = 0;
|
||||
const unsigned short writeLogEveryNthCall = 3;
|
||||
if (counter++ % writeLogEveryNthCall == 0)
|
||||
{
|
||||
tm * curTimeTM = GetLocalTime();
|
||||
stringstream timeDate;
|
||||
timeDate << " " << curTimeTM->tm_year + 1900 << "." << curTimeTM->tm_mon + 1 << "." << curTimeTM->tm_mday << " "
|
||||
<< curTimeTM->tm_hour << ":" << curTimeTM->tm_min << ":" << curTimeTM->tm_sec << " ";
|
||||
LOG(LINFO, (timeDate.str(), GetPlatform().GetMemoryInfo()));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include "base/logging.hpp"
|
||||
|
||||
#include <string>
|
||||
|
||||
// @todo this functionality is not located in logging.hpp since file_logging uses FileWriter which depends on coding lib.
|
||||
// At the same time loging is located in base and I do not want base depens on several more libs.
|
||||
// Probably it's a good idea to move all logging functionality (logging, file_logging, mem_logging and so on)
|
||||
// to a special subsystem which depends on base and coding.
|
||||
|
||||
// If you uncomment the line bellow the application log will be written to a file.
|
||||
// You'll find a log file (logging_<date><time>.log) in the writable directory on Android platform and in Documents on iOS.
|
||||
// #define MWM_LOG_TO_FILE
|
||||
|
||||
// Writing information about free memory to log file.
|
||||
// #ifdef DEBUG
|
||||
// # define OMIM_ENABLE_LOG_MEMORY_INFO
|
||||
// #endif
|
||||
|
||||
void LogMessageFile(base::LogLevel level, base::SrcPoint const & srcPoint, std::string const & msg);
|
||||
void LogMemoryInfo();
|
||||
|
||||
#ifdef OMIM_ENABLE_LOG_MEMORY_INFO
|
||||
# define LOG_MEMORY_INFO() LogMemoryInfo()
|
||||
#else
|
||||
# define LOG_MEMORY_INFO() do {} while(false)
|
||||
#endif
|
||||
|
|
@ -38,8 +38,6 @@
|
|||
4564FA7F2094978D0043CCFB /* remote_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4564FA7D2094978D0043CCFB /* remote_file.cpp */; };
|
||||
470C77CA23CCB04C006F6385 /* http_uploader_background.mm in Sources */ = {isa = PBXBuildFile; fileRef = 470C77C923CCB04C006F6385 /* http_uploader_background.mm */; };
|
||||
5661A5CC20DD57DA00C6B1D1 /* async_gui_thread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 5661A5CB20DD57DA00C6B1D1 /* async_gui_thread.hpp */; };
|
||||
56EB1EDC1C6B6E6C0022D831 /* file_logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */; };
|
||||
56EB1EDD1C6B6E6C0022D831 /* file_logging.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */; };
|
||||
56EB1EDE1C6B6E6C0022D831 /* mwm_traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */; };
|
||||
56EB1EDF1C6B6E6C0022D831 /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1EDB1C6B6E6C0022D831 /* mwm_traits.hpp */; };
|
||||
670E8C761BB318AB00094197 /* platform_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C741BB318AB00094197 /* platform_ios.mm */; };
|
||||
|
|
@ -165,8 +163,6 @@
|
|||
4564FA7D2094978D0043CCFB /* remote_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = remote_file.cpp; sourceTree = "<group>"; };
|
||||
470C77C923CCB04C006F6385 /* http_uploader_background.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = http_uploader_background.mm; sourceTree = "<group>"; };
|
||||
5661A5CB20DD57DA00C6B1D1 /* async_gui_thread.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = async_gui_thread.hpp; sourceTree = "<group>"; };
|
||||
56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_logging.cpp; sourceTree = "<group>"; };
|
||||
56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = file_logging.hpp; sourceTree = "<group>"; };
|
||||
56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_traits.cpp; sourceTree = "<group>"; };
|
||||
56EB1EDB1C6B6E6C0022D831 /* mwm_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_traits.hpp; sourceTree = "<group>"; };
|
||||
670E8C741BB318AB00094197 /* platform_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_ios.mm; sourceTree = "<group>"; };
|
||||
|
|
@ -381,8 +377,6 @@
|
|||
3DF528EA238BFFC1000ED0D5 /* downloader_defines.hpp */,
|
||||
3D061D1E243F5A6500DA45CB /* downloader_utils.cpp */,
|
||||
3D061D1D243F5A6500DA45CB /* downloader_utils.hpp */,
|
||||
56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */,
|
||||
56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */,
|
||||
67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */,
|
||||
67AB92E91B7B3E9100AB5194 /* get_text_by_id.hpp */,
|
||||
3D78156B1F3A14090068B6AC /* gui_thread_apple.mm */,
|
||||
|
|
@ -526,7 +520,6 @@
|
|||
3DE8B98F1DEC3115000E6083 /* network_policy.hpp in Headers */,
|
||||
675343CF1A3F5D5A00A0A8C3 /* preferred_languages.hpp in Headers */,
|
||||
3D30587D1D8320E4004AC712 /* http_client.hpp in Headers */,
|
||||
56EB1EDD1C6B6E6C0022D831 /* file_logging.hpp in Headers */,
|
||||
333A417021C3E13B00AF26F6 /* http_session_manager.h in Headers */,
|
||||
F6DF735B1EC9EAE700D8BA0B /* string_storage_base.hpp in Headers */,
|
||||
3D318A072021DD8B007B2607 /* http_uploader.hpp in Headers */,
|
||||
|
|
@ -695,7 +688,6 @@
|
|||
675343B61A3F5D5A00A0A8C3 /* http_request.cpp in Sources */,
|
||||
675343CC1A3F5D5A00A0A8C3 /* platform.cpp in Sources */,
|
||||
451E32A01F73A8B000964C9F /* secure_storage_ios.mm in Sources */,
|
||||
56EB1EDC1C6B6E6C0022D831 /* file_logging.cpp in Sources */,
|
||||
675343B11A3F5D5A00A0A8C3 /* apple_location_service.mm in Sources */,
|
||||
675343B31A3F5D5A00A0A8C3 /* chunks_download_strategy.cpp in Sources */,
|
||||
675343C01A3F5D5A00A0A8C3 /* location_service.cpp in Sources */,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue