Use %Y-%m-%d %H:%M:%S for Windows log message header

diff --git a/mono/sgen/sgen-gc.h b/mono/sgen/sgen-gc.h
index fb264a4b070b8ec638928729400e554c5a9257ff..9477efb8cd018eaffb838b56e07e6dc75ab0cc2b 100644 (file)
--- a/mono/sgen/sgen-gc.h
+++ b/mono/sgen/sgen-gc.h
@@ -134,7 +134,7 @@ extern guint64 stat_objects_copied_major;
                struct tm tod;                                                                  \
                time(&t);                                                                       \
                localtime_r(&t, &tod);                                                          \
-               strftime(logTime, sizeof(logTime), "%F %T", &tod);                              \
+               strftime(logTime, sizeof(logTime), "%Y-%m-%d %H:%M:%S", &tod);                  \
        } while (0)
 #else
 # define LOG_TIMESTAMP  \

diff --git a/mono/utils/mono-log-common.c b/mono/utils/mono-log-common.c
index a784826ac5cf1a458850c54ebe22fdf9a9851503..6565d4fb119239608ad43d1f7be4f7310e85e809 100644 (file)
--- a/mono/utils/mono-log-common.c
+++ b/mono/utils/mono-log-common.c
@@ -116,7 +116,7 @@ mono_log_write_logfile(const char *domain, GLogLevelFlags level, mono_bool hdr,
                time(&t);
                localtime_r(&t, &tod);
                pid = getpid();
-               strftime(logTime, sizeof(logTime), "%F %T", &tod);
+               strftime(logTime, sizeof(logTime), "%Y-%m-%d %H:%M:%S", &tod);
 #else
                struct tm *tod;
                time(&t);
@@ -129,9 +129,6 @@ mono_log_write_logfile(const char *domain, GLogLevelFlags level, mono_bool hdr,
        }
        nLog = sizeof(logMessage) - iLog - 2;
        iLog = vsnprintf(logMessage+iLog, nLog, format, args);
-#ifdef HOST_WIN32
-       logMessage[iLog++] = '\r';
-#endif
        logMessage[iLog++] = '\n';
        logMessage[iLog++] = '\0';
        fputs(logMessage, logFile);

diff --git a/mono/utils/mono-log-windows.c b/mono/utils/mono-log-windows.c
index ba2f0d38c21b73ab8d6abd365710003982b438f8..c6ebc9ebe471261467a2dfaba68e0ecba81d00ce 100644 (file)
--- a/mono/utils/mono-log-windows.c
+++ b/mono/utils/mono-log-windows.c
@@ -101,12 +101,11 @@ mono_log_write_syslog(const char *domain, GLogLevelFlags level, mono_bool hdr, c
        time(&t);
        tod = localtime(&t);
        pid = _getpid();
-       strftime(logTime, sizeof(logTime), "%F %T", tod);
+       strftime(logTime, sizeof(logTime), "%Y-%m-%d %H:%M:%S", tod);
        iLog = snprintf(logMessage, sizeof(logMessage), "%s level[%c] mono[%d]: ",
                        logTime,mapLogFileLevel(level),pid);
        nLog = sizeof(logMessage) - iLog - 2;
        iLog = vsnprintf(logMessage+iLog, nLog, format, args);
-       logMessage[iLog++] = '\r';
        logMessage[iLog++] = '\n';
        logMessage[iLog++] = 0;
        fputs(logMessage, logFile);