(fix) handle EAS termination when SOGo is being shutdown (fixes #3604)

Conflicts: ActiveSync/SOGoActiveSyncDispatcher.m
Alinto · Mar 29, 2016 · 44d8b63 · 44d8b63
1 parent 5a2676f
commit 44d8b63
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
@@ -1905,6 +1905,9 @@ - (void) processSync: (id <DOMElement>) theDocumentElement
   // We enter our loop detection change
   for (i = 0; i < (heartbeatInterval/internalInterval); i++)
     {
+      if (shouldTerminate)
+        break;
+
       s = [NSMutableString string];
 
       for (j = 0; j < [allCollections count]; j++)
@@ -1944,7 +1947,7 @@ - (void) processSync: (id <DOMElement>) theDocumentElement
         {
           total_sleep = 0;
 
-          while (total_sleep < internalInterval)
+          while (!shouldTerminate && total_sleep < internalInterval)
             {
               // We check if we must break the current synchronization since an other Sync
               // has just arrived.

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.h b/ActiveSync/SOGoActiveSyncDispatcher.h
@@ -37,14 +37,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 @class NSURL;
 @class NSNumber;
 
+static volatile BOOL shouldTerminate = NO;
+
 @interface SOGoActiveSyncDispatcher : NSObject
 {
   NSURL *folderTableURL;
   NSDictionary *imapFolderGUIDS;
   id context;
 
   NSNumber *syncRequest;
-
   BOOL debugOn;
 }
 

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -52,6 +52,7 @@
 #import <NGObjWeb/WODirectAction.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/WOCoreApplication.h>
 
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalEntityObject.h>
@@ -144,6 +145,13 @@
 #include <openssl/x509.h>
 #endif
 
+void handle_terminate(int signum)
+{
+  NSLog(@"Forcing termination of EAS loop.");
+  shouldTerminate = YES;
+  [[WOCoreApplication application] terminateAfterTimeInterval: 1];
+}
+
 @interface SOGoActiveSyncDispatcher (Sync)
 
 - (NSMutableDictionary *) _folderMetadataForKey: (NSString *) theFolderKey;
@@ -161,6 +169,10 @@ - (id) init
   folderTableURL = nil;
   imapFolderGUIDS = nil;
   syncRequest = nil;
+
+  shouldTerminate = NO;
+  signal(SIGTERM, handle_terminate);
+
   return self;
 }
 
@@ -2098,6 +2110,9 @@ - (void) processPing: (id <DOMElement>) theDocumentElement
   // We enter our loop detection change
   for (i = 0; i < (heartbeatInterval/internalInterval); i++)
     {
+      if (shouldTerminate)
+        break;
+
       pool = [[NSAutoreleasePool alloc] init];
       for (j = 0; j < [allFoldersID count]; j++)
         {
@@ -2135,7 +2150,7 @@ - (void) processPing: (id <DOMElement>) theDocumentElement
         {
           total_sleep = 0;
 
-          while (total_sleep < internalInterval)
+          while (!shouldTerminate && total_sleep < internalInterval)
             {
               // We check if we must break the current ping request since an other ping request
               // has just arrived.