Merge pull request #8133 from fstagni/90_fixes13

[9.0] removed COMPONENT_NAME

Author: chrisburr

src/DIRAC/Core/Base/API.py

@@ -3,13 +3,11 @@
 import pprint
 import sys
 
-from DIRAC import gLogger, gConfig, S_OK, S_ERROR
-from DIRAC.Core.Security.ProxyInfo import getProxyInfo, formatProxyInfoAsString
-from DIRAC.Core.Utilities.Version import getCurrentVersion
+from DIRAC import S_ERROR, S_OK, gLogger
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getDNForUsername
 from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getSites
-
-COMPONENT_NAME = "API"
+from DIRAC.Core.Security.ProxyInfo import formatProxyInfoAsString, getProxyInfo
+from DIRAC.Core.Utilities.Version import getCurrentVersion
 
 
 def _printFormattedDictList(dictList, fields, uniqueField, orderBy):
@@ -60,8 +58,7 @@ class API:
     def __init__(self):
         """c'tor"""
         self._printFormattedDictList = _printFormattedDictList
-        self.log = gLogger.getSubLogger(COMPONENT_NAME)
-        self.section = COMPONENT_NAME
+        self.log = gLogger.getSubLogger(self.__class__.__name__)
         self.pPrint = pprint.PrettyPrinter()
         # Global error dictionary
         self.errorDict = {}

src/DIRAC/Interfaces/API/Dirac.py

@@ -47,8 +47,6 @@
 from DIRAC.WorkloadManagementSystem.Client.SandboxStoreClient import SandboxStoreClient
 from DIRAC.WorkloadManagementSystem.Client.WMSClient import WMSClient
 
-COMPONENT_NAME = "DiracAPI"
-
 
 def parseArguments(args):
     argList = []

src/DIRAC/Interfaces/API/DiracAdmin.py

@@ -25,8 +25,6 @@
 if ret["OK"] and "group" in ret["Value"]:
     voName = getVOForGroup(ret["Value"]["group"])
 
-COMPONENT_NAME = "/Interfaces/API/DiracAdmin"
-
 
 class DiracAdmin(API):
     """Administrative functionalities"""
@@ -38,11 +36,6 @@ def __init__(self):
 
         self.csAPI = CSAPI()
 
-        self.dbg = False
-        if gConfig.getValue(self.section + "/LogLevel", "DEBUG") == "DEBUG":
-            self.dbg = True
-
-        self.scratchDir = gConfig.getValue(self.section + "/ScratchDir", "/tmp")
         self.currentDir = os.getcwd()
         self.sitestatus = SiteStatus()
 

src/DIRAC/Interfaces/API/Job.py

@@ -22,31 +22,25 @@
 
    Note that several executables can be provided and wil be executed sequentially.
 """
-import re
 import os
+import re
 import shlex
-
 from io import StringIO
 from urllib.parse import quote
-from pathlib import Path
 
 from DIRAC import S_OK, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
+from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
+from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getCESiteMapping, getDIRACPlatforms
 from DIRAC.Core.Base.API import API
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
-from DIRAC.Core.Workflow.Parameter import Parameter
-from DIRAC.Core.Workflow.Workflow import Workflow
 from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd
-from DIRAC.Core.Utilities.Subprocess import systemCall
 from DIRAC.Core.Utilities.List import uniqueElements
-from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
-from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
-from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
-from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getCESiteMapping, getDIRACPlatforms
+from DIRAC.Core.Utilities.Subprocess import systemCall
+from DIRAC.Core.Workflow.Parameter import Parameter
+from DIRAC.Core.Workflow.Workflow import Workflow
 from DIRAC.Interfaces.API.Dirac import Dirac
-from DIRAC.Workflow.Utilities.Utils import getStepDefinition, addStepToWorkflow
-
-
-COMPONENT_NAME = "/Interfaces/API/Job"
+from DIRAC.Workflow.Utilities.Utils import addStepToWorkflow, getStepDefinition
 
 
 class BadJobParameterError(ValueError):

src/DIRAC/TransformationSystem/Client/TaskManager.py

@@ -6,11 +6,9 @@
 
 import time
 
-from DIRAC import S_OK, S_ERROR, gLogger
-from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
+from DIRAC import S_ERROR, S_OK, gLogger
 from DIRAC.TransformationSystem.Agent.TransformationAgentsUtilities import TransformationAgentsUtilities
-
-COMPONENT_NAME = "TaskManager"
+from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
 
 
 class TaskBase(TransformationAgentsUtilities):

src/DIRAC/TransformationSystem/Client/Transformation.py

@@ -4,16 +4,14 @@
 """
 import json
 
-from DIRAC import gLogger, gConfig, S_OK, S_ERROR
+from DIRAC import S_ERROR, S_OK, gConfig, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
+from DIRAC.Core.Base.API import API
 from DIRAC.Core.Utilities.JEncode import encode
 from DIRAC.Core.Utilities.PromptUser import promptUser
-from DIRAC.Core.Base.API import API
+from DIRAC.RequestManagementSystem.Client.Operation import Operation
 from DIRAC.TransformationSystem.Client.BodyPlugin.BaseBody import BaseBody
 from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
-from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
-from DIRAC.RequestManagementSystem.Client.Operation import Operation
-
-COMPONENT_NAME = "Transformation"
 
 
 class Transformation(API):

src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py

@@ -12,8 +12,6 @@
 from DIRAC.Resources.Storage.StorageElement import StorageElement
 from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient
 
-COMPONENT_NAME = "DownloadInputData"
-
 
 def _isCached(lfn, seName):
     result = returnSingleResult(StorageElement(seName).getFileMetadata(lfn))
@@ -137,7 +135,7 @@ def execute(self, dataToResolve=None):
         if not result["Value"]:
             self.log.warn("Not enough disk space available for download", f"{result['Value']} / {totalSize} bytes")
             self.__setJobParam(
-                COMPONENT_NAME,
+                self.__class__.__name__,
                 f"Not enough disk space available for download: {result['Value']} / {totalSize} bytes",
             )
             return S_OK({"Failed": self.inputData, "Successful": {}})
@@ -216,7 +214,7 @@ def execute(self, dataToResolve=None):
             report += "\n".join(failedReplicas)
 
         if report:
-            self.__setJobParam(COMPONENT_NAME, report)
+            self.__setJobParam(self.__class__.__name__, report)
 
         return S_OK({"Successful": resolvedData, "Failed": failedReplicas})
 

src/DIRAC/WorkloadManagementSystem/Client/InputDataResolution.py

@@ -7,12 +7,11 @@
     for applications.
 """
 import DIRAC
-from DIRAC import S_OK, S_ERROR, gLogger, gConfig
+from DIRAC import S_ERROR, S_OK, gConfig, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
 from DIRAC.WorkloadManagementSystem.Client.PoolXMLSlice import PoolXMLSlice
-from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 
-COMPONENT_NAME = "InputDataResolution"
 CREATE_CATALOG = False
 
 
@@ -22,8 +21,7 @@ class InputDataResolution:
     def __init__(self, argumentsDict):
         """Standard constructor"""
         self.arguments = argumentsDict
-        self.name = COMPONENT_NAME
-        self.log = gLogger.getSubLogger(self.name)
+        self.log = gLogger.getSubLogger(self.__class__.__name__)
         op = Operations()
         self.arguments.setdefault("Configuration", {})["AllReplicas"] = op.getValue(
             "InputDataPolicy/AllReplicas", False

src/DIRAC/WorkloadManagementSystem/Client/PoolXMLSlice.py

@@ -5,21 +5,16 @@
 """
 import os
 
-from DIRAC import S_OK, S_ERROR, gLogger
+from DIRAC import S_ERROR, S_OK, gLogger
 from DIRAC.Resources.Catalog.PoolXMLCatalog import PoolXMLCatalog
 
-COMPONENT_NAME = "PoolXMLSlice"
-
 
 class PoolXMLSlice:
-    #############################################################################
     def __init__(self, catalogName):
         """Standard constructor"""
         self.fileName = catalogName
-        self.name = COMPONENT_NAME
-        self.log = gLogger.getSubLogger(self.name)
+        self.log = gLogger.getSubLogger(self.__class__.__name__)
 
-    #############################################################################
     def execute(self, dataDict):
         """Given a dictionary of resolved input data, this will creates a POOL XML slice."""
         poolXMLCatName = self.fileName
@@ -61,6 +56,3 @@ def execute(self, dataDict):
             return S_ERROR("Exception during construction of POOL XML slice")
 
         return S_OK("POOL XML Slice created")
-
-
-# EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#