Merge pull request #310 from zowe/turning-logger-off

Turning logger off

CHANGELOG.md

@@ -8,6 +8,10 @@ All notable changes to the Zowe Client Python SDK will be documented in this fil
 
 - Included support for `AUTH_TYPE_CERT_PEM` and `AUTH_TYPE_NONE` in `session` [#291] (https://github.com/zowe/zowe-client-python-sdk/issues/291) and [#296] (https://github.com/zowe/zowe-client-python-sdk/issues/296)
 
+- Updated all functions descriptions to be consitent [#279] (https://github.com/zowe/zowe-client-python-sdk/issues/279)
+
+- *Breaking*: Added Support for turning off loggers. Replaced `setLoggerLevel` in Logger class with `setAllLoggerLevel` [#278] (https://github.com/zowe/zowe-client-python-sdk/issues/278)
+
 ### Bug Fixes
 
 - Fixed a bug on `create` in `Datasets` where the target dataset gets created with a different block size when `like` is specified [#295] (https://github.com/zowe/zowe-client-python-sdk/issues/295)

src/core/zowe/core_for_zowe_sdk/config_file.py

@@ -49,17 +49,18 @@ class ConfigFile:
     Class used to represent a single config file.
 
     Mainly it will have the following details :
-    1. Type ("User Config" or "Team Config")
-        User Configs override Team Configs.
-        User Configs are used to have personalised config details
-        that the user don't want to have in the Team Config.
-    2. Directory in which the file is located.
-    3. Name (excluding .config.json or .config.user.json)
-    4. Contents of the file.
-    4.1 Profiles
-    4.2 Defaults
-    4.3 Schema Property
-    5. Secure Properties associated with the file.
+        1. Type ("User Config" or "Team Config")
+            -------
+            User Configs override Team Configs.
+            User Configs are used to have personalised config details
+            that the user don't want to have in the Team Config.
+        2. Directory in which the file is located.
+        3. Name (excluding .config.json or .config.user.json)
+        4. Contents of the file.
+            4.1 Profiles
+            4.2 Defaults
+            4.3 Schema Property
+        5. Secure Properties associated with the file.
     """
 
     type: str
@@ -111,6 +112,13 @@ def init_from_file(
         """
         Initializes the class variable after
         setting filepath (or if not set, autodiscover the file)
+
+        Parameters
+        -------
+        validate_schema: bool
+            True if validation is preferred, false otherwise
+        suppress_config_file_warnings: bool
+            True if the property should be stored securely, False otherwise.
         """
         if self.filepath is None:
             try:
@@ -160,7 +168,6 @@ def schema_list(self, cwd=None) -> list:
         Returns
         -------
         Dictionary
-
             Returns the profile properties from schema (prop: value)
         """
 
@@ -202,6 +209,16 @@ def get_profile(
     ) -> Profile:
         """
         Load given profile including secure properties and excluding values from base profile
+
+        Parameters
+        -------
+        profile_name: str
+            Name of the profile
+        profile_type: str
+            Type of the profile
+        validate_shcema: bool
+            True if validation is preferred
+
         Returns
         -------
         Profile
@@ -227,6 +244,7 @@ def autodiscover_config_dir(self) -> None:
         """
         Autodiscover Zowe z/OSMF Team Config files by going up the path from
         current working directory
+
         Returns
         -------
         None
@@ -254,11 +272,17 @@ def autodiscover_config_dir(self) -> None:
     def get_profilename_from_profiletype(self, profile_type: str) -> str:
         """
         Returns profilename from given profiletype as defined in the team config profile
+
+        Parameters
+        -------
+        profile_type: str
+            Type of the profile
+
         Returns
         -------
         str
+            The exact profilename of the profile to load from the mentioned type.
 
-        Return the exact profilename of the profile to load from the mentioned type.
         First tries to look into the defaults, if not found,
         then it tries to iterate through the profiles
         """
@@ -297,10 +321,17 @@ def get_profilename_from_profiletype(self, profile_type: str) -> str:
     def find_profile(self, path: str, profiles: dict):
         """
         Find a profile at a specified location from within a set of nested profiles
+
+        Parameters
+        -------
+        path: str
+            The location to look for the profile
+        profiles: dict
+            A dict of nested profiles
+
         Returns
         -------
         dictionary
-
             The profile object that was found, or None if not found
         """
         segments = path.split(".")
@@ -315,10 +346,15 @@ def find_profile(self, path: str, profiles: dict):
     def load_profile_properties(self, profile_name: str) -> dict:
         """
         Load profile properties given profile_name including secure properties
+
+        Parameters
+        -------
+        profile_name: str
+            Name of the profile
+
         Returns
         -------
         dictionary
-
             Object containing profile properties
 
         Load exact profile properties (without prepopulated fields from base profile)
@@ -406,11 +442,16 @@ def set_property(self, json_path, value, secure=None) -> None:
         """
         Set a property in the profile, storing it securely if necessary.
 
-        Parameters:
-            json_path (str): The JSON path of the property to set.
-            value (str): The value to be set for the property.
-            profile_name (str): The name of the profile to set the property in.
-            secure (bool): If True, the property will be stored securely. Default is None.
+        Parameters
+        -------
+        json_path: str
+            The JSON path of the property to set.
+        value: str
+            The value to be set for the property.
+        profile_name: str
+            The name of the profile to set the property in.
+        secure: bool
+            If True, the property will be stored securely. Default is None.
         """
         if self.profiles is None:
             self.init_from_file()
@@ -439,9 +480,12 @@ def set_profile(self, profile_path: str, profile_data: dict) -> None:
         """
         Set a profile in the config file.
 
-        Parameters:
-            profile_path (str): The path of the profile to be set. eg: profiles.zosmf
-            profile_data (dict): The data to be set for the profile.
+        Parameters
+        -------
+        profile_path: str
+            The path of the profile to be set. eg: profiles.zosmf
+        profile_data: dict
+            The data to be set for the profile.
         """
         if self.profiles is None:
             self.init_from_file()
@@ -465,10 +509,14 @@ def set_profile(self, profile_path: str, profile_data: dict) -> None:
     def save(self, update_secure_props=True):
         """
         Save the config file to disk. and secure props to vault
-        parameters:
-            secure_props (bool): If True, the secure properties will be stored in the vault. Default is True.
-        Returns:
-            None
+        parameters
+        -------
+        secure_props: bool
+            If True, the secure properties will be stored in the vault. Default is True.
+
+        Returns
+        -------
+        None
         """
         # Updating the config file with any changes
         if not any(self.profiles.values()):
@@ -486,6 +534,16 @@ def save(self, update_secure_props=True):
     def get_profile_name_from_path(self, path: str) -> str:
         """
         Get the name of the profile from the given path.
+
+        Parameters
+        -------
+        path: str
+            The location to look for the profile
+
+        Returns
+        -------
+        str
+            Returns the profile name
         """
         segments = path.split(".")
         profile_name = ".".join(segments[i] for i in range(1, len(segments), 2) if segments[i - 1] != "properties")
@@ -494,5 +552,15 @@ def get_profile_name_from_path(self, path: str) -> str:
     def get_profile_path_from_name(self, short_path: str) -> str:
         """
         Get the path of the profile from the given name.
+
+        Parameters
+        -------
+        short_path: str
+            Partial path of profile
+
+        Returns
+        -------
+        str
+            Returns the full profile path
         """
         return re.sub(r"(^|\.)", r"\1profiles.", short_path)

src/core/zowe/core_for_zowe_sdk/connection.py

@@ -30,9 +30,9 @@ class ApiConnection:
     """
 
     def __init__(self, host_url, user, password, ssl_verification=True):
-        __logger = Log.registerLogger(__name__)
-
         """Construct an ApiConnection object."""
+
+        __logger = Log.registerLogger(__name__)
         if not host_url or not user or not password:
             __logger.error("Missing connection argument")
             raise MissingConnectionArgs()

src/core/zowe/core_for_zowe_sdk/credential_manager.py

@@ -16,8 +16,6 @@
 
 import commentjson
 
-from .logger import Log
-
 from .constants import constants
 from .exceptions import SecureProfileLoadFailed
 from .logger import Log
@@ -37,6 +35,7 @@ class CredentialManager:
     def load_secure_props() -> None:
         """
         load secure_props stored for the given config file
+
         Returns
         -------
         None
@@ -67,6 +66,7 @@ def load_secure_props() -> None:
     def save_secure_props() -> None:
         """
         Set secure_props for the given config file
+
         Returns
         -------
         None
@@ -90,10 +90,12 @@ def _get_credential(service_name: str, account_name: str) -> Optional[str]:
         """
         Retrieve the credential from the keyring or storage.
         If the credential exceeds the maximum length, retrieve it in parts.
+
         Parameters
         ----------
         service_name: str
             The service name for the credential retrieval
+
         Returns
         -------
         str
@@ -139,12 +141,14 @@ def _delete_credential(service_name: str, account_name: str) -> None:
         """
         Delete the credential from the keyring or storage.
         If the keyring.delete_password function is not available, iterate through and delete credentials.
+
         Parameters
         ----------
         service_name: str
             The service name for the credential deletion
         account_name: str
             The account name for the credential deletion
+
         Returns
         -------
         None

src/core/zowe/core_for_zowe_sdk/logger.py

@@ -3,7 +3,13 @@
 
 
 class Log:
-    """root logger setup and a function to customize logger level"""
+    """Class used to represent a logger
+
+    Attributes
+    -------
+    loggers: set
+        The set of all loggers
+    """
 
     dirname = os.path.join(os.path.expanduser("~"), ".zowe/logs")
 
@@ -20,11 +26,72 @@ class Log:
 
     @staticmethod
     def registerLogger(name: str):
+        """
+        Create and register a logger
+
+        Parameters
+        ----------
+        name: str
+            name for the logger
+
+        Returns
+        -------
+        Logger
+            A Logger object named after the file where it is created
+        """
         logger = logging.getLogger(name)
         Log.loggers.add(logger)
         return logger
 
     @staticmethod
-    def setLoggerLevel(level: int):
+    def setAllLoggerLevel(level: int):
+        """
+        Set display level for all loggers
+
+        Parameters
+        ----------
+        level: int
+            The intended logger level
+        """
         for logger in Log.loggers:
             logger.setLevel(level)
+
+    @staticmethod
+    def close(logger):
+        """
+        Disable a logger
+
+        Parameters
+        ----------
+        logger: Logger
+            The logger to be turned off
+        """
+        logger.disabled = True
+
+    @staticmethod
+    def open(logger):
+        """
+        Enable a logger
+
+        Parameters
+        ----------
+        logger: Logger
+            The logger to be turned on
+        """
+        logger.disabled = False
+
+    @staticmethod
+    def closeAll():
+        """
+        Disable all loggers
+        """
+        for logger in Log.loggers:
+            logger.disabled = True
+
+    @staticmethod
+    def openAll():
+        """
+        Enable all loggers
+        """
+        for logger in Log.loggers:
+            logger.disabled = False