p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 10 Wiki Activity

degesch: unfuck debug logging 

We can store most of the messages in buffers, which gives us the nice
possibility of using the formatter to fix encodings, as well as the
ability to redisplay the debug prints.

And we can also have some nice colors.
This commit is contained in:
Přemysl Eric Janouch 2015-07-09 23:09:10 +02:00
parent 445837007d
commit 7a7192d327
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
degesch.c
View File

@ -2749,6 +2749,18 @@ log_full (struct app_context *ctx, struct server *s, struct buffer *buffer,
#define log_server_error(s, buffer, ...) \ #define log_server_error(s, buffer, ...) \
log_server ((s), (buffer), BUFFER_LINE_ERROR, __VA_ARGS__) log_server ((s), (buffer), BUFFER_LINE_ERROR, __VA_ARGS__)
#define log_global_debug(ctx, ...) \
BLOCK_START \
if (g_debug_mode) \
log_global ((ctx), 0, "(*) " __VA_ARGS__); \
BLOCK_END
#define log_server_debug(s, ...) \
BLOCK_START \
if (g_debug_mode) \
log_server ((s), (s)->buffer, 0, "(*) " __VA_ARGS__); \
BLOCK_END
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Lines that are used in more than one place // Lines that are used in more than one place
@ -3377,7 +3389,7 @@ irc_send (struct server *s, const char *format, ...)
{ {
if (!soft_assert (irc_is_connected (s))) if (!soft_assert (irc_is_connected (s)))
{ {
print_debug ("tried sending a message to a dead server connection"); log_server_debug (s, "sending a message to a dead server connection");
return; return;
} }
@ -3392,19 +3404,7 @@ irc_send (struct server *s, const char *format, ...)
str_append_vprintf (&str, format, ap); str_append_vprintf (&str, format, ap);
va_end (ap); va_end (ap);
if (g_debug_mode) log_server_debug (s, "#a<< \"#S\"#r", ATTR_PART, str.str);
{
input_hide (&s->ctx->input);
char *server_name =
iconv_xstrdup (s->ctx->term_from_utf8, s->name, -1, NULL);
char *term = irc_to_term (s->ctx, str.str);
fprintf (stderr, "[%s] <== \"%s\"\n", server_name, term);
free (term);
free (server_name);
input_show (&s->ctx->input);
}
str_append_str (&s->write_buffer, &str); str_append_str (&s->write_buffer, &str);
str_free (&str); str_free (&str);
@ -5939,19 +5939,7 @@ irc_process_message (const struct irc_message *msg,
{ {
struct server *s = user_data; struct server *s = user_data;
if (g_debug_mode) log_server_debug (s, "#a>> \"#S\"#r", ATTR_JOIN, raw);
{
input_hide (&s->ctx->input);
char *server_name =
iconv_xstrdup (s->ctx->term_from_utf8, s->name, -1, NULL);
char *term = irc_to_term (s->ctx, raw);
fprintf (stderr, "[%s] ==> \"%s\"\n", server_name, term);
free (term);
free (server_name);
input_show (&s->ctx->input);
}
struct irc_handler key = { .name = msg->command }; struct irc_handler key = { .name = msg->command };
struct irc_handler *handler = bsearch (&key, g_irc_handlers, struct irc_handler *handler = bsearch (&key, g_irc_handlers,
@ -7759,6 +7747,9 @@ process_input_utf8 (struct app_context *ctx, char *input, int alias_level)
return; return;
char *expanded = expand_alias (ctx, name, input); char *expanded = expand_alias (ctx, name, input);
if (expanded)
log_global_debug (ctx, "Alias expanded to \"#s\"", expanded);
if (!expanded) if (!expanded)
log_global_error (ctx, "#s: /#s", "No such command or alias", name); log_global_error (ctx, "#s: /#s", "No such command or alias", name);
else if (alias_level != 0) else if (alias_level != 0)