getDRC should use the Conga namespace DRC #26

Dyalog · Jul 24, 2023 · 3edaba7 · 3edaba7
1 parent a4ce7b3
commit 3edaba7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/Source/isolate/RPCServer.dyalog b/Source/isolate/RPCServer.dyalog
@@ -1,4 +1,4 @@
-:Namespace RPCServer
+:Namespace RPCServer
     (⎕IO ⎕ML)←1 1
     SendProgress←0
     Protocol←''      ⍝ Set to IPv4 or IPv6 to lock in
@@ -74,7 +74,10 @@
       allowremote←GetEnv 'AllowRemote' ⍝ Remote access
       allowremote←(0≠≢allowremote)/{1↓¨(⍵=',')⊂⍵}',',allowremote
 
-      z←##.DRC.Init''
+      :If 9.2≠##.⎕NC⊂'DRC' ⍝ if DRC is not an instance of Conga.LIB
+          z←##.DRC.Init''
+      :EndIf
+
       localaddrs←⊃⍪/{0::0 3⍴⊂⍬ ⋄ DNSLookup ⍵}¨'' 'localhost' ⍝ Find all local addresses
       :If 0=≢localaddrs ⍝ /// paranoia: the above SHOULD work
           localaddrs←1 3⍴'IPv4' '127.0.0.1'(127 0 0 1)

diff --git a/Source/ynys/Init.dyalog b/Source/ynys/Init.dyalog
@@ -1,4 +1,4 @@
- {r}←{allowremote}Init local;here;z;ss;op;maxws;ws;rt;iso;ports;pids;pclts;t
+ {r}←{allowremote}Init local;here;z;ss;op;maxws;ws;rt;iso;ports;pids;pclts;t
  r←⎕THIS.⎕IO←0
  :If 0=⎕NC'allowremote' ⋄ allowremote←⍬ ⋄ :EndIf
  :If newSession''
@@ -12,7 +12,8 @@
      z←getSet'debug'op.debug    ⍝ on or off
      :Trap trapErr''
          ##.DRC←here.DRC←getDRC op.drc
-         :If ~(⊃z←DRC.Init ⍬)∊0
+         :If 9.2≠⎕NC⊂'DRC' ⍝ if DRC is not an instance of Conga.LIB
+         :AndIf ~(⊃z←DRC.Init ⍬)∊0
              ('CONGA INIT FAILED: ',,⍕z)⎕SIGNAL 11
          :EndIf
          z←DRC.SetProp'.' 'Protocol'(op.protocol)

diff --git a/Source/ynys/getDRC.dyalog b/Source/ynys/getDRC.dyalog
@@ -1,17 +1,18 @@
- r←getDRC ref;ws
+ r←getDRC ref;ws
  :If ref≠# ⋄ r←ref                 ⍝ Not set, so we must create it
  :ElseIf 9=#.⎕NC'DRC' ⋄ r←#.DRC    ⍝ in # already?
  :Else
      ws←'conga.dws'
      :Trap 0
-         'DRC'#.⎕CY ws              ⍝ See if the interpreter can find it
+         'Conga'#.⎕CY ws              ⍝ See if the interpreter can find it
      :Else
          ws←addWSpath'conga.dws'     ⍝ Actually adds [DYALOG]/ws
          :Trap 0
-             'DRC'#.⎕CY ws
+             'Conga'#.⎕CY ws
          :Else
              'Unable to locate conga.dws'⎕SIGNAL 11
          :EndTrap
      :EndTrap
+     #.DRC←#.Conga.Init'isolate'
      r←#.DRC
  :EndIf