colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core,log: minor coding style changes

Browse Source
This commit is contained in:
Aleksander Morgado
2022-08-05 17:11:31 +02:00
parent 4a62ea3e84
commit 4cb8ca8f0b
2 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/mm-log.c
View File

@@ -51,16 +51,16 @@ enum {
}; };
static gboolean ts_flags = TS_FLAG_NONE; static gboolean ts_flags = TS_FLAG_NONE;
static guint32 log_level = MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR; static guint32 log_level = MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR;
static GTimeVal rel_start = { 0, 0 }; static GTimeVal rel_start = { 0, 0 };
static int logfd = -1; static int logfd = -1;
static gboolean append_log_level_text = TRUE; static gboolean append_log_level_text = TRUE;
static void (*log_backend) (const char *loc, static void (*log_backend) (const char *loc,
const char *func, const char *func,
int syslog_level, int syslog_level,
const char *message, const char *message,
size_t length); size_t length);
typedef struct { typedef struct {
guint32 num; guint32 num;
@@ -69,10 +69,9 @@ typedef struct {
static const LogDesc level_descs[] = { static const LogDesc level_descs[] = {
{ MM_LOG_LEVEL_ERR, "ERR" }, { MM_LOG_LEVEL_ERR, "ERR" },
{ MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "WARN" }, { MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "WARN" },
{ MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "INFO" }, { MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "INFO" },
{ MM_LOG_LEVEL_DEBUG | MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "DEBUG" }, { MM_LOG_LEVEL_DEBUG | MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "DEBUG" },
{ 0, NULL }
}; };
static GString *msgbuf = NULL; static GString *msgbuf = NULL;
@@ -82,14 +81,14 @@ static int
mm_to_syslog_priority (MMLogLevel level) mm_to_syslog_priority (MMLogLevel level)
{ {
switch (level) { switch (level) {
case MM_LOG_LEVEL_DEBUG: case MM_LOG_LEVEL_ERR:
return LOG_DEBUG; return LOG_ERR;
case MM_LOG_LEVEL_WARN: case MM_LOG_LEVEL_WARN:
return LOG_WARNING; return LOG_WARNING;
case MM_LOG_LEVEL_INFO: case MM_LOG_LEVEL_INFO:
return LOG_INFO; return LOG_INFO;
case MM_LOG_LEVEL_ERR: case MM_LOG_LEVEL_DEBUG:
return LOG_ERR; return LOG_DEBUG;
default: default:
break; break;
} }
@@ -130,14 +129,14 @@ static const char *
log_level_description (MMLogLevel level) log_level_description (MMLogLevel level)
{ {
switch (level) { switch (level) {
case MM_LOG_LEVEL_DEBUG: case MM_LOG_LEVEL_ERR:
return "<debug>"; return "<error>";
case MM_LOG_LEVEL_WARN: case MM_LOG_LEVEL_WARN:
return "<warn> "; return "<warn> ";
case MM_LOG_LEVEL_INFO: case MM_LOG_LEVEL_INFO:
return "<info> "; return "<info> ";
case MM_LOG_LEVEL_ERR: case MM_LOG_LEVEL_DEBUG:
return "<error>"; return "<debug>";
default: default:
break; break;
} }
@@ -148,11 +147,12 @@ log_level_description (MMLogLevel level)
static void static void
log_backend_file (const char *loc, log_backend_file (const char *loc,
const char *func, const char *func,
int syslog_level, int syslog_level,
const char *message, const char *message,
size_t length) size_t length)
{ {
ssize_t ign; ssize_t ign;
ign = write (logfd, message, length); ign = write (logfd, message, length);
if (ign) {} /* whatever; really shut up about unused result */ if (ign) {} /* whatever; really shut up about unused result */
@@ -162,9 +162,9 @@ log_backend_file (const char *loc,
static void static void
log_backend_syslog (const char *loc, log_backend_syslog (const char *loc,
const char *func, const char *func,
int syslog_level, int syslog_level,
const char *message, const char *message,
size_t length) size_t length)
{ {
syslog (syslog_level, "%s", message); syslog (syslog_level, "%s", message);
} }
@@ -173,15 +173,15 @@ log_backend_syslog (const char *loc,
static void static void
log_backend_systemd_journal (const char *loc, log_backend_systemd_journal (const char *loc,
const char *func, const char *func,
int syslog_level, int syslog_level,
const char *message, const char *message,
size_t length) size_t length)
{ {
const char *line; const char *line;
size_t file_length; size_t file_length;
if (loc == NULL) { if (loc == NULL) {
sd_journal_send ("MESSAGE=%s", message, sd_journal_send ("MESSAGE=%s", message,
"PRIORITY=%d", syslog_level, "PRIORITY=%d", syslog_level,
NULL); NULL);
return; return;
@@ -197,11 +197,11 @@ log_backend_systemd_journal (const char *loc,
file_length = 0; file_length = 0;
} }
sd_journal_send ("MESSAGE=%s", message, sd_journal_send ("MESSAGE=%s", message,
"PRIORITY=%d", syslog_level, "PRIORITY=%d", syslog_level,
"CODE_FUNC=%s", func, "CODE_FUNC=%s", func,
"CODE_FILE=%.*s", file_length, loc, "CODE_FILE=%.*s", file_length, loc,
"CODE_LINE=%s", line, "CODE_LINE=%s", line,
NULL); NULL);
} }
#endif #endif
@@ -215,7 +215,7 @@ _mm_log (gpointer obj,
const gchar *fmt, const gchar *fmt,
...) ...)
{ {
va_list args; va_list args;
GTimeVal tv; GTimeVal tv;
if (!(log_level & level)) if (!(log_level & level))
@@ -267,31 +267,32 @@ _mm_log (gpointer obj,
} }
static void static void
log_handler (const gchar *log_domain, log_handler (const gchar *log_domain,
GLogLevelFlags level, GLogLevelFlags level,
const gchar *message, const gchar *message,
gpointer ignored) gpointer ignored)
{ {
log_backend (NULL, NULL, glib_to_syslog_priority (level), message, strlen (message)); log_backend (NULL, NULL, glib_to_syslog_priority (level), message, strlen (message));
} }
gboolean gboolean
mm_log_set_level (const char *level, GError **error) mm_log_set_level (const gchar *level,
GError **error)
{ {
gboolean found = FALSE; guint i;
const LogDesc *diter;
for (diter = &level_descs[0]; diter->name; diter++) { for (i = 0; i < G_N_ELEMENTS (level_descs); i++) {
if (!strcasecmp (diter->name, level)) { if (!g_ascii_strcasecmp (level_descs[i].name, level)) {
log_level = diter->num; log_level = level_descs[i].num;
found = TRUE;
break; break;
} }
} }
if (!found) if (i == G_N_ELEMENTS (level_descs)) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_INVALID_ARGS, g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_INVALID_ARGS,
"Unknown log level '%s'", level); "Unknown log level '%s'", level);
return FALSE;
}
#if defined WITH_QMI #if defined WITH_QMI
qmi_utils_set_traces_enabled (log_level & MM_LOG_LEVEL_DEBUG ? TRUE : FALSE); qmi_utils_set_traces_enabled (log_level & MM_LOG_LEVEL_DEBUG ? TRUE : FALSE);
@@ -301,17 +302,17 @@ mm_log_set_level (const char *level, GError **error)
mbim_utils_set_traces_enabled (log_level & MM_LOG_LEVEL_DEBUG ? TRUE : FALSE); mbim_utils_set_traces_enabled (log_level & MM_LOG_LEVEL_DEBUG ? TRUE : FALSE);
#endif #endif
return found; return TRUE;
} }
gboolean gboolean
mm_log_setup (const char *level, mm_log_setup (const gchar *level,
const char *log_file, const gchar *log_file,
gboolean log_journal, gboolean log_journal,
gboolean show_timestamps, gboolean show_timestamps,
gboolean rel_timestamps, gboolean rel_timestamps,
gboolean show_personal_info, gboolean show_personal_info,
GError **error) GError **error)
{ {
/* levels */ /* levels */
if (level && strlen (level) && !mm_log_set_level (level, error)) if (level && strlen (level) && !mm_log_set_level (level, error))
@@ -331,7 +332,7 @@ mm_log_setup (const char *level,
append_log_level_text = FALSE; append_log_level_text = FALSE;
} else } else
#endif #endif
if (log_file == NULL) { if (!log_file) {
openlog (G_LOG_DOMAIN, LOG_CONS | LOG_PID | LOG_PERROR, LOG_DAEMON); openlog (G_LOG_DOMAIN, LOG_CONS | LOG_PID | LOG_PERROR, LOG_DAEMON);
log_backend = log_backend_syslog; log_backend = log_backend_syslog;
} else { } else {

26
src/mm-log.h
View File

@@ -11,7 +11,8 @@
* GNU General Public License for more details: * GNU General Public License for more details:
* *
* Copyright (C) 2011-2020 Red Hat, Inc. * Copyright (C) 2011-2020 Red Hat, Inc.
* Copyright (C) 2020 Aleksander Morgado <aleksander@aleksander.es> * Copyright (C) 2020-2022 Aleksander Morgado <aleksander@aleksander.es>
* Copyright (C) 2022 Google, Inc.
*/ */
#ifndef MM_LOG_H #ifndef MM_LOG_H
@@ -24,7 +25,7 @@ typedef enum {
MM_LOG_LEVEL_ERR = 0x00000001, MM_LOG_LEVEL_ERR = 0x00000001,
MM_LOG_LEVEL_WARN = 0x00000002, MM_LOG_LEVEL_WARN = 0x00000002,
MM_LOG_LEVEL_INFO = 0x00000004, MM_LOG_LEVEL_INFO = 0x00000004,
MM_LOG_LEVEL_DEBUG = 0x00000008 MM_LOG_LEVEL_DEBUG = 0x00000008,
} MMLogLevel; } MMLogLevel;
#if !defined MM_MODULE_NAME #if !defined MM_MODULE_NAME
@@ -53,16 +54,15 @@ void _mm_log (gpointer obj,
const gchar *fmt, const gchar *fmt,
...) __attribute__((__format__ (__printf__, 6, 7))); ...) __attribute__((__format__ (__printf__, 6, 7)));
gboolean mm_log_set_level (const char *level, GError **error); gboolean mm_log_set_level (const gchar *level,
GError **error);
gboolean mm_log_setup (const char *level, gboolean mm_log_setup (const gchar *level,
const char *log_file, const gchar *log_file,
gboolean log_journal, gboolean log_journal,
gboolean show_ts, gboolean show_ts,
gboolean rel_ts, gboolean rel_ts,
gboolean show_personal_info, gboolean show_personal_info,
GError **error); GError **error);
void mm_log_shutdown (void);
void mm_log_shutdown (void);
#endif /* MM_LOG_H */ #endif /* MM_LOG_H */