Found some more instances of the phrase 'free software' and changed them to 'open...

[citadel.git] / citadel / event_client.c

diff --git a/citadel/event_client.c b/citadel/event_client.c
index e360a124a96ca7f56fda6a4c16a58c7e1026d979..f893548e421e85342ec5d37dd31f4560d940ea64 100644 (file)
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -2,7 +2,7 @@
  *
  * 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.
@@ -116,7 +116,7 @@ void ShutDownDBCLient(AsyncIO *IO)
        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);
@@ -154,7 +154,9 @@ DB_PerformNext(struct ev_loop *loop, ev_idle *watcher, int revents)
                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);
        }
 }