Fix to Logger for multi-byte log data

Dyalog · Oct 5, 2018 · e1040d3 · e1040d3
1 parent a887047
commit e1040d3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/Core/MiServer.dyalog b/Core/MiServer.dyalog
@@ -7,10 +7,10 @@
     :Field Public TID←¯1                ⍝ Thread ID Server is running under
     :Field Public BlockSize←640000      ⍝ Blocksize when returning files
 
-    :Field Public SessionHandler←⎕NS ''
-    :Field Public Authentication←⎕NS ''
-    :Field Public Logger←⎕NS ''
-    :Field Public Application←⎕NS ''
+    :Field Public SessionHandler
+    :Field Public Authentication
+    :Field Public Logger
+    :Field Public Application
     :Field Public PageTemplates←⍬
     :Field Public Encoders←⍬  ⍝ pointers to instances of content encoders
     :Field Public Datasources←⍬
@@ -288,6 +288,10 @@
     ∇ Make config;CongaVersion;rc;allocated;port;ports
       :Access Public
       :Implements Constructor
+      SessionHandler←⎕NS''
+      Authentication←⎕NS''
+      Logger←⎕NS''
+      Application←⎕NS''
 
       SessionHandler.GetSession←{}   ⍝ So we can always
       SessionHandler.HouseKeeping←{} ⍝    call these fns

diff --git a/Extensions/Logger.dyalog b/Extensions/Logger.dyalog
@@ -12,6 +12,7 @@
     :field private EOL                  ⍝ End Of Line
 
     missing←{0∊⍴⍵:'-' ⋄ ⍵}
+    Char←⎕DR ' '
 
     ∇ Make ms;file;log
       :Access public
@@ -80,11 +81,10 @@
       :EndTrap
 
       :Trap 22 ⍝ file name error
-          TieNo←fn ⎕NTIE 0 34
+          TieNo←fn ⎕NTIE 0
       :Else
           :Trap 0
-              ⎕NUNTIE fn ⎕NCREATE 0
-              TieNo←fn ⎕NTIE 0 34
+              TieNo←{0 ⎕NTIE⍨⍵⊣⎕NUNTIE ⍵ ⎕NCREATE 0}fn
           :Else
               1 ##.ms.Log'Unable to open log file "',fn,'"'
               :Return
@@ -93,7 +93,7 @@
       r←0≠TieNo
     ∇
 
-    tryGetting←{0::('-'@(' '∘=))(⊃⎕DM),'-retrieving-"',⍵,'"' ⋄ ⍕⍎⍵}
+    tryGetting←{0::('-'@(' '∘=))(⊃⎕DM),'-retrieving-"',(∊⍕⍵),'"' ⋄ ∊⍕⍎⍵}
 
     ∇ Log req;addr;user;ts;method;page;status;msec;bytes
       :Access public
@@ -118,6 +118,9 @@
 
     ∇ ClearCache
       :Hold 'Lumberjack'
+          :If Char≠⎕DR Cache
+              Cache←('?'@{Char≠⎕DR¨⍵})Cache
+          :EndIf
           Cache ⎕NAPPEND TieNo
           Cache←''
       :EndHold