summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-10-07 10:55:06 +0200
committerThomas Haller <thaller@redhat.com>2015-10-09 14:58:03 +0200
commit2f6978efb73e87acb9c21c0b5a616fcaf372cb0e (patch)
tree305d583caa356e943fa4a18a9bd232dbfc4df024
parent98e34208bdfd8adb8b0f2e500c832a418bfc8374 (diff)
downloadNetworkManager-2f6978efb73e87acb9c21c0b5a616fcaf372cb0e.tar.gz
logging/trivial: move code
-rw-r--r--src/nm-logging.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/nm-logging.c b/src/nm-logging.c
index 6476d7664f..a8bc661ba6 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -48,18 +48,6 @@ nm_log_handler (const gchar *log_domain,
const gchar *message,
gpointer ignored);
-static NMLogLevel log_level = LOGL_INFO;
-static char *log_domains;
-static NMLogDomain logging[_LOGL_N_REAL];
-static gboolean logging_set_up;
-enum {
- LOG_BACKEND_GLIB,
- LOG_BACKEND_SYSLOG,
- LOG_BACKEND_JOURNAL,
- LOG_BACKEND_JOURNAL_SYSLOG_STYLE,
-} log_backend = LOG_BACKEND_GLIB;
-static char *logging_domains_to_string;
-
typedef struct {
NMLogDomain num;
const char *name;
@@ -73,6 +61,18 @@ typedef struct {
gboolean full_details;
} LogLevelDesc;
+static NMLogLevel log_level = LOGL_INFO;
+static char *log_domains;
+static NMLogDomain logging[_LOGL_N_REAL];
+static gboolean logging_set_up;
+enum {
+ LOG_BACKEND_GLIB,
+ LOG_BACKEND_SYSLOG,
+ LOG_BACKEND_JOURNAL,
+ LOG_BACKEND_JOURNAL_SYSLOG_STYLE,
+} log_backend = LOG_BACKEND_GLIB;
+static char *logging_domains_to_string;
+
static const LogLevelDesc level_desc[_LOGL_N] = {
[LOGL_TRACE] = { "TRACE", "<trace>", LOG_DEBUG, G_LOG_LEVEL_DEBUG, TRUE },
[LOGL_DEBUG] = { "DEBUG", "<debug>", LOG_INFO, G_LOG_LEVEL_DEBUG, TRUE },