aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

print failed redirections to rawlog even if there's no failure signal.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2019 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-11-15 16:29:25 +00:00 committed by cras
parent a110b05a0c
commit 0b4db7b17a
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/irc/core/servers-redirect.c
View File

@ -356,6 +356,27 @@ static const char *redirect_match(REDIRECT_REC *redirect, const char *event,
return signal != NULL ? signal : redirect->default_signal; return signal != NULL ? signal : redirect->default_signal;
} }
static void redirect_abort(IRC_SERVER_REC *server, REDIRECT_REC *rec)
{
char *str;
server->redirects =
g_slist_remove(server->redirects, rec);
if (!rec->destroyed) {
/* emit the failure signal */
str = g_strdup_printf(rec->failure_signal != NULL ?
"FAILED %s: %s" : "FAILED %s",
rec->cmd->name, rec->failure_signal);
rawlog_redirect(server->rawlog, str);
g_free(str);
if (rec->failure_signal != NULL)
signal_emit(rec->failure_signal, 1, server);
}
server_redirect_destroy(rec);
}
static REDIRECT_REC *redirect_find(IRC_SERVER_REC *server, const char *event, static REDIRECT_REC *redirect_find(IRC_SERVER_REC *server, const char *event,
const char *args, const char **signal, const char *args, const char **signal,
int *match_stop) int *match_stop)
@ -363,7 +384,6 @@ static REDIRECT_REC *redirect_find(IRC_SERVER_REC *server, const char *event,
REDIRECT_REC *redirect; REDIRECT_REC *redirect;
GSList *tmp, *next; GSList *tmp, *next;
time_t now; time_t now;
char *str;
/* find the redirection */ /* find the redirection */
*signal = NULL; redirect = NULL; *signal = NULL; redirect = NULL;
@ -391,20 +411,8 @@ static REDIRECT_REC *redirect_find(IRC_SERVER_REC *server, const char *event,
next = tmp->next; next = tmp->next;
if (rec->destroyed || if (rec->destroyed ||
(rec->remote && (now-rec->created) > rec->cmd->timeout) || (rec->remote && (now-rec->created) > rec->cmd->timeout) ||
(!rec->remote && redirect != NULL)) { (!rec->remote && redirect != NULL))
server->redirects = redirect_abort(server, rec);
g_slist_remove(server->redirects, rec);
if (!rec->destroyed && rec->failure_signal != NULL) {
/* emit the failure signal */
str = g_strdup_printf("FAILED %s: %s",
rec->cmd->name,
rec->failure_signal);
rawlog_redirect(server->rawlog, str);
g_free(str);
signal_emit(rec->failure_signal, 1, server);
}
server_redirect_destroy(rec);
}
} }
return redirect; return redirect;