X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_queue.c;h=da323455f3d063800a63277c24b45fb67a2130a4;hb=8e944083763c9ddcb32d763cf8f19c966d01f873;hp=024336df871e7de743e3bebd19bbcbba902b45f9;hpb=4ebdea1025ba5fdbcc8bdd6ba142557d216796d1;p=citadel.git diff --git a/citadel/modules/xmpp/xmpp_queue.c b/citadel/modules/xmpp/xmpp_queue.c index 024336df8..da323455f 100644 --- a/citadel/modules/xmpp/xmpp_queue.c +++ b/citadel/modules/xmpp/xmpp_queue.c @@ -1,22 +1,15 @@ /* * XMPP event queue * - * Copyright (c) 2007-2009 by Art Cancro + * Copyright (c) 2007-2021 by Art Cancro * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3. - * - * - * - * 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. - * - * - * - * + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3. * + * 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. */ #include "sysdep.h" @@ -52,12 +45,10 @@ #include "support.h" #include "config.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" int queue_event_seq = 0; -struct xmpp_event *xmpp_queue = NULL; void xmpp_queue_event(int event_type, char *email_addr) { @@ -67,7 +58,7 @@ void xmpp_queue_event(int event_type, char *email_addr) { int purged_something = 0; struct CitContext *cptr; - XMPP_syslog(LOG_DEBUG, "xmpp_queue_event(%d, %s)\n", event_type, email_addr); + syslog(LOG_DEBUG, "xmpp: xmpp_queue_event(%d, %s)", event_type, email_addr); /* Purge events more than a minute old */ begin_critical_section(S_XMPP_QUEUE); @@ -147,30 +138,3 @@ void xmpp_process_events(void) { XMPP->last_event_processed = highest_event; } - - -void xmpp_cleanup_events(void) -{ - struct xmpp_event *ptr, *ptr2; - begin_critical_section(S_XMPP_QUEUE); - ptr = xmpp_queue; - xmpp_queue = NULL; - while (ptr != NULL) { - ptr2 = ptr->next; - free(ptr); - ptr = ptr2; - } - end_critical_section(S_XMPP_QUEUE); - -} - -CTDL_MODULE_INIT(xmpp_queue) -{ - if (!threading) { - - CtdlRegisterCleanupHook(xmpp_cleanup_events); - } - - /* return our module name for the log */ - return "xmpp_queue"; -}