logging: move fetching monotonic timestamp to end of nm_logging_syslog_openlog()
It just makes more sense to first fully setup logging, and then fetching
the timestamp. In practice, the effect previously was very similar.
(cherry picked from commit 2912155584
)
This commit is contained in:
@@ -832,6 +832,8 @@ nm_logging_set_prefix (const char *format, ...)
|
|||||||
void
|
void
|
||||||
nm_logging_syslog_openlog (const char *logging_backend, gboolean debug)
|
nm_logging_syslog_openlog (const char *logging_backend, gboolean debug)
|
||||||
{
|
{
|
||||||
|
gboolean fetch_monotonic_timestamp = FALSE;
|
||||||
|
|
||||||
if (global.log_backend != LOG_BACKEND_GLIB)
|
if (global.log_backend != LOG_BACKEND_GLIB)
|
||||||
g_return_if_reached ();
|
g_return_if_reached ();
|
||||||
|
|
||||||
@@ -843,10 +845,7 @@ nm_logging_syslog_openlog (const char *logging_backend, gboolean debug)
|
|||||||
global.log_backend = LOG_BACKEND_JOURNAL;
|
global.log_backend = LOG_BACKEND_JOURNAL;
|
||||||
global.uses_syslog = TRUE;
|
global.uses_syslog = TRUE;
|
||||||
global.debug_stderr = debug;
|
global.debug_stderr = debug;
|
||||||
|
fetch_monotonic_timestamp = TRUE;
|
||||||
/* ensure we read a monotonic timestamp. Reading the timestamp the first
|
|
||||||
* time causes a logging message. We don't want to do that during _nm_log_impl. */
|
|
||||||
nm_utils_get_monotonic_timestamp_ns ();
|
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
@@ -860,5 +859,10 @@ nm_logging_syslog_openlog (const char *logging_backend, gboolean debug)
|
|||||||
G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
|
G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
|
||||||
nm_log_handler,
|
nm_log_handler,
|
||||||
NULL);
|
NULL);
|
||||||
}
|
|
||||||
|
|
||||||
|
if (fetch_monotonic_timestamp) {
|
||||||
|
/* ensure we read a monotonic timestamp. Reading the timestamp the first
|
||||||
|
* time causes a logging message. We don't want to do that during _nm_log_impl. */
|
||||||
|
nm_utils_get_monotonic_timestamp_ns ();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user