Began working on the 'clean shutdown' code for the new thread architecture.

[citadel.git] / citadel / modules / migrate / serv_migrate.c

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index 10404772b3f2647a0fb676e77a84730d58033984..091822c38a97598fe44d7c6c4a8fa2255bd86ecb 100644 (file)
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -831,7 +831,7 @@ void migr_xml_end(void *data, const char *el) {
                        msglist = NULL;
                        msglist_alloc = 0;
                        syslog(LOG_DEBUG, "Imported %d messages.\n", msgcount);
-                       if (CtdlThreadCheckStop()) {
+                       if (server_shutting_down) {
                                return;
                }
        }
@@ -932,7 +932,7 @@ void migr_do_import(void) {
                linelen = strlen(buf);
                strcpy(&buf[linelen++], "\n");
 
-               if (CtdlThreadCheckStop())
+               if (server_shutting_down)
                        break;  // Should we break or return?
                
                if (buf[0] == '\0')