luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle --max_log_size overflow

Browse Source
This commit is contained in:
Sergiu Deitsch 2021-03-30 23:16:40 +02:00
parent 45fdc922de
commit 3533c22d21
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/logging.cc
View File

@ -341,7 +341,7 @@ static const char* GetAnsiColorCode(GLogColor color) {
// Safely get max_log_size, overriding to 1 if it somehow gets defined as 0 // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0
static int32 MaxLogSize() { static int32 MaxLogSize() {
return (FLAGS_max_log_size > 0 ? FLAGS_max_log_size : 1); return (FLAGS_max_log_size > 0 && FLAGS_max_log_size < 4096 ? FLAGS_max_log_size : 1);
} }
// An arbitrary limit on the length of a single log message. This // An arbitrary limit on the length of a single log message. This
@ -490,7 +490,7 @@ class LogCleaner {
const string& filename_extension) const; const string& filename_extension) const;
bool IsLogLastModifiedOver(const string& filepath, int days) const; bool IsLogLastModifiedOver(const string& filepath, int days) const;
bool enabled_; bool enabled_;
int overdue_days_; int overdue_days_;
char dir_delim_; // filepath delimiter ('/' or '\\') char dir_delim_; // filepath delimiter ('/' or '\\')
@ -1230,7 +1230,7 @@ void LogFileObject::Write(bool force_flush,
file_length_ += header_len; file_length_ += header_len;
bytes_since_flush_ += header_len; bytes_since_flush_ += header_len;
} }
// Write to LOG file // Write to LOG file
if ( !stop_writing ) { if ( !stop_writing ) {
// fwrite() doesn't return an error when the disk is full, for // fwrite() doesn't return an error when the disk is full, for
@ -1660,7 +1660,7 @@ int AndroidLogLevel(const int severity) {
} }
} }
#endif // defined(__ANDROID__) #endif // defined(__ANDROID__)
} // namespace } // namespace
// Flush buffered message, called by the destructor, or any other function // Flush buffered message, called by the destructor, or any other function
// that needs to synchronize the log. // that needs to synchronize the log.
@ -1696,13 +1696,13 @@ void LogMessage::Flush() {
++num_messages_[static_cast<int>(data_->severity_)]; ++num_messages_[static_cast<int>(data_->severity_)];
} }
LogDestination::WaitForSinks(data_); LogDestination::WaitForSinks(data_);
#if defined(__ANDROID__) #if defined(__ANDROID__)
const int level = AndroidLogLevel((int)data_->severity_); const int level = AndroidLogLevel((int)data_->severity_);
const std::string text = std::string(data_->message_text_); const std::string text = std::string(data_->message_text_);
__android_log_write(level, "native", text.substr(0,data_->num_chars_to_log_).c_str()); __android_log_write(level, "native", text.substr(0,data_->num_chars_to_log_).c_str());
#endif // defined(__ANDROID__) #endif // defined(__ANDROID__)
if (append_newline) { if (append_newline) {
// Fix the ostrstream back how it was before we screwed with it. // Fix the ostrstream back how it was before we screwed with it.
// It's 99.44% certain that we don't need to worry about doing this. // It's 99.44% certain that we don't need to worry about doing this.