Allow the user to configure Conga's FIFOMode

Dyalog · Aug 28, 2018 · 0e7a5cf · 0e7a5cf
1 parent b5c3f0a
commit 0e7a5cf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Config/Server.xml b/Config/Server.xml
@@ -14,16 +14,19 @@
 
 <!-- Communications Settings -->
     <Port>8080</Port>                                <!-- Preferred port that MiServer listens on --> 
-    <Ports>8080-8090</Ports>                         <!-- List of ports that we can listen on (when running multiple MiServers -->
+    <Ports>8080-8090</Ports>                         <!-- List of ports that we can listen on (when running multiple MiServers) -->
+    <FIFOMode>1</FIFOMode>                           <!-- Use Conga FIFO mode? -->
+    <WaitTimeout>5000ms</WaitTimeout>                <!-- Time to wait for request from client before Conga times out -->
+
     <UseContentEncoding>1</UseContentEncoding>       <!-- for HTTP compression -->
     <SupportedEncodings>gzip,deflate</SupportedEncodings> <!-- name(s) of class(es) that use ContentEncoder interface -->
+
     <Secure>0</Secure>                               <!-- Running secure? (SSL) if 0, remaining settings below have no meaning -->
     <CertFile></CertFile>                            <!-- Private Certificate file -->
     <KeyFile></KeyFile>                              <!-- Public Key file -->
     <RootCertDir></RootCertDir>                      <!-- Root certificate directory (Conga) -->
     <SSLFlags>96</SSLFlags>                          <!-- SSL flags (Conga) 96 = 32 Accept without validating + 64 Request Client Cert -->
-    <WaitTimeout>5000ms</WaitTimeout>                <!-- Time to wait for request from client before Conga times out -->
-
+
 <!-- Page/Request Settings -->
     <Lang>en</Lang>                                     <!-- language setting --> 
     <DefaultPage>index</DefaultPage>                    <!-- default page to load if none is specified in client request -->

diff --git a/Core/Boot.dyalog b/Core/Boot.dyalog
@@ -294,6 +294,7 @@
             Config.Debug←Config Setting'Debug' 1 0
             Config.DefaultExtension←Config Setting'DefaultExtension' 0 '.mipage'
             Config.DefaultPage←Config Setting'DefaultPage' 0 'index.mipage'
+            Config.FIFOMode←Config Setting 'FIFOMode' 1 1 ⍝ Conga FIFO mode default to on (1)
             Config.FormatHtml←Config Setting'FormatHtml' 1 0
             Config.Host←Config Setting'Host' 0 'localhost'
             Config.HTTPCacheTime←'m'#.Dates.ParseTime Config Setting'HTTPCacheTime' 0 '0' ⍝ default to off (0)

diff --git a/Core/MiServer.dyalog b/Core/MiServer.dyalog
@@ -304,7 +304,7 @@
       :EndFor
       ('Unable to allocate any TCP/IP port in ',1↓∊⍕¨',',¨ports)⎕SIGNAL(~allocated)/11
       {}#.DRC.SetProp'.' 'EventMode' 1 ⍝ report Close/Timeout as events
-      {}#.DRC.SetProp ServerName'FIFOMode' 1
+      {}#.DRC.SetProp ServerName'FIFOMode' Config.FIFOMode
       {}#.DRC.SetProp ServerName'DecodeBuffers' 15
 
       #.HtmlElement.RenderBugDefault←Config.RenderBug