Merge pull request #147 from PanDAWMS/revert-146-master

Revert "optimize loki"

pilot/control/payload.py

@@ -444,7 +444,7 @@ def get_logging_info(job: JobData, args: object) -> dict:
             logger.info("correct logserver formal: logging_type;protocol://hostname:port")
             return {}
 
-        regex = r"logserver=(?P<logging_type>[^;]+);(?P<protocol>[^:]+)://(?P<hostname>[^:]+):(?P<port>\d+)"
+        regex = r"logserver='(?P<logging_type>[^;]+);(?P<protocol>[^:]+)://(?P<hostname>[^:]+):(?P<port>\d+)'"
         match = search(regex, logserver)
         if match:
             logging_type = match.group('logging_type')

pilot/util/https.py

@@ -858,8 +858,7 @@ def request2(url: str = "",
     # Send the request securely
     try:
         logger.debug('sending data to server')
-        timeout = int(config.Pilot.http_maxtime)
-        with urllib.request.urlopen(req, context=ssl_context, timeout=timeout) as response:
+        with urllib.request.urlopen(req, context=ssl_context, timeout=30) as response:
             # Handle the response here
             logger.debug(f"response.status={response.status}, response.reason={response.reason}")
             ret = response.read().decode('utf-8')

pilot/util/lokirealtimelogger.py

@@ -51,22 +51,18 @@ def format(self, record: logging.LogRecord) -> dict:
 
         formatted = {
             "timestamp": record.created,
-            # "process": record.process,
-            # "thread": record.thread,
+            "process": record.process,
+            "thread": record.thread,
             "function": record.funcName,
             "module": record.module,
             "name": record.name,
             "level": record.levelname,
         }
 
-        """
-        # Not send all information, some loki services have limitations on number of labels.
-
         record_keys = set(record.__dict__.keys())
         for key in record_keys:
             if key not in formatted and key not in ['msg']:
                 formatted[key] = getattr(record, key)
-        """
 
         message = record.msg
         try: