nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3972

Browse Source 
8766528 epee: fallback to a counter if gmtime fails when rotating logs (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-25 15:21:25 -05:00
commit c0c6102260
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/epee/src/mlog.cpp
View File

@ -47,6 +47,7 @@ using namespace epee;
static std::string generate_log_filename(const char *base) static std::string generate_log_filename(const char *base)
{ {
std::string filename(base); std::string filename(base);
static unsigned int fallback_counter = 0;
char tmp[200]; char tmp[200];
struct tm tm; struct tm tm;
time_t now = time(NULL); time_t now = time(NULL);
@ -56,7 +57,7 @@ static std::string generate_log_filename(const char *base)
#else #else
(!gmtime_r(&now, &tm)) (!gmtime_r(&now, &tm))
#endif #endif
strcpy(tmp, "unknown"); snprintf(tmp, sizeof(tmp), "part-%u", ++fallback_counter);
else else
strftime(tmp, sizeof(tmp), "%Y-%m-%d-%H-%M-%S", &tm); strftime(tmp, sizeof(tmp), "%Y-%m-%d-%H-%M-%S", &tm);
tmp[sizeof(tmp) - 1] = 0; tmp[sizeof(tmp) - 1] = 0;