mirror of
https://github.com/openstreetmap/mod_tile.git
synced 2026-01-14 00:35:13 +00:00
a14924a999
* Using [`GLib Logging Framework`](https://developer.gnome.org/programming-guidelines/stable/logging.html.en) for logging * Created new `g_logger` function for logging * Outputs to `stdout`/`stderr` only when running in `foreground` * `stderr` for `message`, `warning`, `critical` & `error` levels * `stdout` for `debug` & `info` levels * Use `G_MESSAGES_DEBUG=all` environment to enable `debug` to print * Otherwise, output will be to `syslog` or `systemd journal` (when appropriate) * Standardized usage of `{LOG_PRIORITY}: ` prefix in log messages * Only when using `syslog`, otherwise `GLib Logging` will take care of it * Changed `fprintf(stderr`, `printf` & `perror` calls to `g_logger` calls * You might want to check them out closely to make sure I chose the right levels * No changes to `logging/output` were made to "`foreground`" programs (I.E. `render_*`) * Changed `0`,`1` to `no_argument`,`required_argument` in `getopt_long`'s `long_options` * Fixed `renderd`'s `foreground` opt (should be `no_argument` [0] rather than `reguired_argument` [1]) * Basic test for `mod_tile` module * ~~Extended `renderd` log priority onto Mapnik's logger~~
143 lines
3.4 KiB
C
143 lines
3.4 KiB
C
/*
|
|
* Copyright (c) 2007 - 2020 by mod_tile contributors (see AUTHORS file)
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; If not, see http://www.gnu.org/licenses/.
|
|
*/
|
|
|
|
#define _GNU_SOURCE 1
|
|
#define G_LOG_USE_STRUCTURED 1
|
|
|
|
#include <glib.h>
|
|
#include <stdio.h>
|
|
#include <syslog.h>
|
|
|
|
extern int foreground;
|
|
|
|
const char *g_logger_level_name(int log_level)
|
|
{
|
|
switch (log_level) {
|
|
case G_LOG_LEVEL_ERROR:
|
|
return "ERROR";
|
|
|
|
case G_LOG_LEVEL_CRITICAL:
|
|
return "CRITICAL";
|
|
|
|
case G_LOG_LEVEL_WARNING:
|
|
return "WARNING";
|
|
|
|
case G_LOG_LEVEL_MESSAGE:
|
|
return "MESSAGE";
|
|
|
|
case G_LOG_LEVEL_INFO:
|
|
return "INFO";
|
|
|
|
case G_LOG_LEVEL_DEBUG:
|
|
return "DEBUG";
|
|
|
|
default:
|
|
return "UNKNOWN";
|
|
}
|
|
}
|
|
|
|
void g_logger(int log_level, const char *format, ...)
|
|
{
|
|
int size;
|
|
char *log_message, *log_message_prefixed;
|
|
|
|
va_list args;
|
|
|
|
va_start(args, format);
|
|
|
|
size = vasprintf(&log_message, format, args);
|
|
|
|
if (size == -1) {
|
|
g_error("ERROR: vasprintf failed in g_logger");
|
|
}
|
|
|
|
const GLogField log_fields[] = {{"MESSAGE", log_message, -1}};
|
|
|
|
size = asprintf(&log_message_prefixed, "%s: %s", g_logger_level_name(log_level), log_message);
|
|
|
|
if (size == -1) {
|
|
g_error("ERROR: asprintf failed in g_logger");
|
|
}
|
|
|
|
const GLogField log_fields_prefixed[] = {{"MESSAGE", log_message_prefixed, -1}};
|
|
|
|
if (foreground == 1) {
|
|
switch (log_level) {
|
|
// Levels >= G_LOG_LEVEL_ERROR will terminate the program
|
|
case G_LOG_LEVEL_ERROR:
|
|
g_log_writer_standard_streams(log_level, log_fields, 1, NULL);
|
|
break;
|
|
|
|
// Levels <= G_LOG_LEVEL_INFO will only show when using G_MESSAGES_DEBUG
|
|
case G_LOG_LEVEL_INFO:
|
|
g_log_writer_standard_streams(log_level, log_fields, 1, NULL);
|
|
break;
|
|
|
|
default:
|
|
g_log_writer_default(log_level, log_fields, 1, NULL);
|
|
}
|
|
} else if (g_log_writer_is_journald(fileno(stderr))) {
|
|
switch (log_level) {
|
|
// Levels >= G_LOG_LEVEL_ERROR will terminate the program
|
|
case G_LOG_LEVEL_ERROR:
|
|
g_log_writer_journald(log_level, log_fields, 1, NULL);
|
|
break;
|
|
|
|
// Levels <= G_LOG_LEVEL_INFO will only show when using G_MESSAGES_DEBUG
|
|
case G_LOG_LEVEL_INFO:
|
|
g_log_writer_journald(log_level, log_fields, 1, NULL);
|
|
break;
|
|
|
|
default:
|
|
g_log_writer_default(log_level, log_fields, 1, NULL);
|
|
}
|
|
} else {
|
|
setlogmask(LOG_UPTO(LOG_INFO));
|
|
|
|
switch (log_level) {
|
|
case G_LOG_LEVEL_ERROR:
|
|
syslog(LOG_ERR, log_message_prefixed, NULL);
|
|
break;
|
|
|
|
case G_LOG_LEVEL_CRITICAL:
|
|
syslog(LOG_CRIT, log_message_prefixed, NULL);
|
|
break;
|
|
|
|
case G_LOG_LEVEL_WARNING:
|
|
syslog(LOG_WARNING, log_message_prefixed, NULL);
|
|
break;
|
|
|
|
case G_LOG_LEVEL_MESSAGE:
|
|
syslog(LOG_INFO, log_message_prefixed, NULL);
|
|
break;
|
|
|
|
case G_LOG_LEVEL_INFO:
|
|
syslog(LOG_INFO, log_message_prefixed, NULL);
|
|
break;
|
|
|
|
case G_LOG_LEVEL_DEBUG:
|
|
syslog(LOG_DEBUG, log_message_prefixed, NULL);
|
|
break;
|
|
}
|
|
}
|
|
|
|
va_end(args);
|
|
|
|
free(log_message_prefixed);
|
|
free(log_message);
|
|
}
|