fix: Multiple small fixes to make it work with DIRAC and DiracX

Author: Robin-Van-de-Merghel

Pilot/dirac-pilot.py

@@ -76,16 +76,16 @@
         receivedContent = ""
         if not sys.stdin.isatty():
             receivedContent = sys.stdin.read()
+        
         log = RemoteLogger(
             pilotParams.diracXServer,
             "Pilot",
             bufsize=pilotParams.loggerBufsize,
             pilotUUID=pilotParams.pilotUUID,
             debugFlag=pilotParams.debugFlag,
             jwt=pilotParams.jwt,
-            isPilotLoggerOn=pilotParams.isLegacyLogging
+            legacy_logging=pilotParams.isLegacyLogging
         )
-        log.info(str(pilotParams.jwt))
         log.info("Remote logger activated")
         log.buffer.write(log.format_to_json(
             "INFO",

Pilot/pilotCommands.py

@@ -90,28 +90,20 @@ def wrapper(self):
             self.log.info(
                 "Flushing the remote logger buffer for pilot on sys.exit(): %s (exit code:%s)" % (pRef, str(exCode))
             )
-            if self.pp.jwt:
-                try:
-                    self.log.error(str(exCode))
-                    self.log.error(traceback.format_exc())
-                    self.log.buffer.flush(force=True)
-                except Exception as exc:
-                    self.log.error("Remote logger couldn't be finalised %s " % str(exc))
-            else:
-                # No force here because there's no remote logger if we're here
-                self.log.buffer.flush()
+
+            try:
+                self.log.error(str(exCode))
+                self.log.error(traceback.format_exc())
+                self.log.buffer.flush(force=True)
+            except Exception as exc:
+                self.log.error("Remote logger couldn't be finalised %s " % str(exc))
 
             raise
         except Exception as exc:
             # unexpected exit: document it and bail out.
             self.log.error(str(exc))
             self.log.error(traceback.format_exc())
-
-            if self.pp.jwt:
-                # Force flush if it's a remote logger
-                self.log.buffer.flush(force=True)
-            else:
-                self.log.buffer.flush()
+            self.log.buffer.flush(force=True)
             raise
         finally:
             self.log.buffer.cancelTimer()

Pilot/pilotTools.py

@@ -719,10 +719,13 @@ def sendMessage(diracx_URL, pilotUUID, legacy=False, jwt={}, rawMessage = []):
         "lines": rawMessage
     }
 
+    if not diracx_URL.endswith("/"):
+        diracx_URL += "/"
+
     if legacy:
-        endpoint_path = "/api/pilots/legacy/message"
+        endpoint_path = "api/pilots/legacy/message"
     else:
-        endpoint_path = "/api/pilots/internal/message"
+        endpoint_path = "api/pilots/internal/message"
 
     config = TokenBasedRequest(
         diracx_URL=diracx_URL,
@@ -772,7 +775,7 @@ def __init__(self, pilotParams):
                 flushInterval=interval,
                 bufsize=bufsize,
                 jwt=pilotParams.jwt,
-                legacy_logging=self.pp.isLegacyLogging
+                legacy_logging=pilotParams.isLegacyLogging
             )
 
         self.log.isPilotLoggerOn = isPilotLoggerOn
@@ -1137,6 +1140,7 @@ def __set_remote_logging(self):
                 with open(cert, "rb") as fp:
                     self.jwt = extract_diracx_payload(fp.read())
                     self.isLegacyLogging = True
+                    self.log.info("Successfully extracted token from proxy.")
             else:
                 raise RuntimeError("Could not locate a proxy via X509_USER_PROXY")
         else: