]>
Commit | Line | Data |
---|---|---|
27a9d69f ER |
1 | set sane format for archived logs, so the files would be sortable |
2 | ideally this should came from config (date_format=iso8601) | |
3 | ||
4 | --- nagios-3.2.3/base/logging.c~ 2009-05-22 03:55:21.000000000 +0300 | |
5 | +++ nagios-3.2.3/base/logging.c 2010-12-04 23:33:52.112688537 +0200 | |
6 | @@ -397,8 +397,7 @@ | |
7 | stat_result = stat(log_file, &log_file_stat); | |
8 | ||
9 | /* get the archived filename to use */ | |
f9ffdd32 | 10 | - asprintf(&log_archive, "%s%snagios-%02d-%02d-%d-%02d.log", log_archive_path, (log_archive_path[strlen(log_archive_path)-1] == '/') ? "" : "/", t->tm_mon + 1, t->tm_mday, t->tm_year + 1900, t->tm_hour); |
27a9d69f | 11 | - |
f9ffdd32 | 12 | + asprintf(&log_archive," %s%snagios-%04d-%02d-%02d-%02d.log", log_archive_path, (log_archive_path[strlen(log_archive_path)-1] == '/') ? "" : "/", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour); |
27a9d69f | 13 | /* rotate the log file */ |
f9ffdd32 | 14 | rename_result = my_rename(log_file, log_archive); |
27a9d69f ER |
15 | |
16 | --- nagios-3.2.3/cgi/cgiutils.c~ 2010-12-04 21:34:34.000000000 +0200 | |
17 | +++ nagios-3.2.3/cgi/cgiutils.c 2010-12-04 23:34:28.915968009 +0200 | |
18 | @@ -1604,7 +1604,7 @@ | |
f9ffdd32 | 19 | t = localtime(&this_scheduled_log_rotation); |
27a9d69f ER |
20 | |
21 | /* use the time that the log rotation occurred to figure out the name of the log file */ | |
f9ffdd32 | 22 | - snprintf(buffer, buffer_length, "%snagios-%02d-%02d-%d-%02d.log", log_archive_path, t->tm_mon + 1, t->tm_mday, t->tm_year + 1900, t->tm_hour); |
23 | + snprintf(buffer, buffer_length, "%snagios-%04d-%02d-%02d-%02d.log", log_archive_path, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour); | |
24 | buffer[buffer_length-1] = '\x0'; | |
27a9d69f ER |
25 | |
26 | return; |