Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e5fd111 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Add timestamps to libbase's stderr logging. 

adb is the client that wants this, but I'm not aware of any client that
doesn't.

Bug: http://b/28467098
Test: tested manually with cat.
Change-Id: I82c3f7ddf466a67aedfbb9010e0939a44b71d3e5
parent 863d8e11

base/logging.cpp

+15 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "android-base/logging.h"



#include <libgen.h>

#include <time.h>



// For getprogname(3) or program_invocation_short_name.

#if defined(__ANDROID__) || defined(__APPLE__)
@@ -186,12 +187,24 @@ static const char* ProgramInvocationName() { 


void StderrLogger(LogId, LogSeverity severity, const char*, const char* file,

                  unsigned int line, const char* message) {

  struct tm now;

  time_t t = time(nullptr);



#if defined(_WIN32)

  localtime_s(&now, &t);

#else

  localtime_r(&t, &now);

#endif



  char timestamp[32];

  strftime(timestamp, sizeof(timestamp), "%m-%d %H:%M:%S", &now);



  static const char log_characters[] = "VDIWEF";

  static_assert(arraysize(log_characters) - 1 == FATAL + 1,

                "Mismatch in size of log_characters and values in LogSeverity");

  char severity_char = log_characters[severity];

  fprintf(stderr, "%s %c %5d %5d %s:%u] %s\n", ProgramInvocationName(),

          severity_char, getpid(), GetThreadId(), file, line, message);

  fprintf(stderr, "%s %c %s %5d %5d %s:%u] %s\n", ProgramInvocationName(),

          severity_char, timestamp, getpid(), GetThreadId(), file, line, message);

}