*
* Copyright (c) 1998-2009 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is open source 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 3 of the License, or
* (at your option) any later version.
CitContext *Ctx =IO->CitContext;
become_session(Ctx);
- EVM_syslog(LOG_DEBUG, "DBEVENT\n");
+ EVM_syslog(LOG_DEBUG, "DBEVENT Terminating.\n");
ev_cleanup_stop(event_db, &IO->db_abort_by_shutdown);
assert(IO->Terminate);
break;
case eTerminateConnection:
case eAbort:
- ShutDownDBCLient(IO);
+ ev_idle_stop(event_db, &IO->db_unwind_stack);
+ ev_cleanup_stop(loop, &IO->db_abort_by_shutdown);
+ ShutDownDBCLient(IO);
}
}
return eSendReply;
}
-int ShutDownEventQueue(void)
-{
- pthread_mutex_lock(&DBEventQueueMutex);
- ev_async_send (event_db, &DBExitEventLoop);
- pthread_mutex_unlock(&DBEventQueueMutex);
-
- pthread_mutex_lock(&EventQueueMutex);
- ev_async_send (EV_DEFAULT_ &ExitEventLoop);
- pthread_mutex_unlock(&EventQueueMutex);
- return 0;
-}
-
void FreeAsyncIOContents(AsyncIO *IO)
{
FreeStrBuf(&IO->IOBuf);
switch (IO->DNSQuery->PostDNS(IO))
{
case eAbort:
- IO->DNSFail(IO);
+ switch (IO->DNSFail(IO)) {
+ case eAbort:
+ ShutDownCLient(IO);
+ default:
+ break;
+
+ }
default:
- break;
+ break;
}
}