besapi 3.3.3__tar.gz → 3.4.2__tar.gz

{besapi-3.3.3/src/besapi.egg-info → besapi-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: besapi
-Version: 3.3.3
+Version: 3.4.2
 Summary: Library for working with the BigFix REST API
 Home-page: https://github.com/jgstew/besapi
 Author: Matt Hansen, James Stewart

{besapi-3.3.3 → besapi-3.4.2}/src/besapi/besapi.py

@@ -29,7 +29,7 @@ import requests
 from lxml import etree, objectify
 from pkg_resources import resource_filename
 
-__version__ = "3.3.3"
+__version__ = "3.4.2"
 
 besapi_logger = logging.getLogger("besapi")
 

{besapi-3.3.3 → besapi-3.4.2}/src/besapi/plugin_utilities.py

@@ -11,6 +11,7 @@ import sys
 import besapi
 
 
+# NOTE: This does not work as expected when run from plugin_utilities
 def get_invoke_folder(verbose=0):
     """Get the folder the script was invoked from"""
     # using logging here won't actually log it to the file:
@@ -30,6 +31,7 @@ def get_invoke_folder(verbose=0):
     return invoke_folder
 
 
+# NOTE: This does not work as expected when run from plugin_utilities
 def get_invoke_file_name(verbose=0):
     """Get the filename the script was invoked from"""
     # using logging here won't actually log it to the file:
@@ -86,41 +88,41 @@ def setup_plugin_argparse(plugin_args_required=False):
     return arg_parser
 
 
-def setup_plugin_logging(log_file_name="", verbose=0, console=True):
+def setup_plugin_logging(log_file_path="", verbose=0, console=True):
     """setup logging for plugin use"""
-    # get folder the script was invoked from:
-    invoke_folder = get_invoke_folder(verbose)
 
-    if not log_file_name or log_file_name == "":
-        log_file_name = get_invoke_file_name() + ".log"
+    if not log_file_path or log_file_path == "":
+        log_file_path = os.path.join(
+            get_invoke_folder(verbose), get_invoke_file_name(verbose) + ".log"
+        )
 
     # set different log levels:
     log_level = logging.WARNING
     if verbose:
         log_level = logging.INFO
+        print("INFO: Log File Path:", log_file_path)
     if verbose > 1:
         log_level = logging.DEBUG
 
-    # get path to put log file in:
-    log_filename = os.path.join(invoke_folder, log_file_name)
-
     handlers = [
         logging.handlers.RotatingFileHandler(
-            log_filename, maxBytes=5 * 1024 * 1024, backupCount=1
+            log_file_path, maxBytes=5 * 1024 * 1024, backupCount=1
         )
     ]
 
     # log output to console if arg provided:
     if console:
         handlers.append(logging.StreamHandler())
+        print("INFO: also logging to console")
 
-    # setup logging:
-    logging.basicConfig(
-        encoding="utf-8",
-        level=log_level,
-        format="%(asctime)s %(levelname)s:%(message)s",
-        handlers=handlers,
-    )
+    # return logging config:
+    return {
+        "encoding": "utf-8",
+        "level": log_level,
+        "format": "%(asctime)s %(levelname)s:%(message)s",
+        "handlers": handlers,
+        "force": True,
+    }
 
 
 def get_besapi_connection(args):
@@ -134,6 +136,9 @@ def get_besapi_connection(args):
         print("Password was not provided, provide REST API password:")
         password = getpass.getpass()
 
+    if args.user:
+        logging.debug("REST API Password Length: %s", len(password))
+
     # process args, setup connection:
     rest_url = args.rest_url
 
@@ -145,12 +150,16 @@ def get_besapi_connection(args):
     if args.user and password:
         try:
             bes_conn = besapi.besapi.BESConnection(args.user, password, rest_url)
-            # bes_conn.login()
         except (
             AttributeError,
             ConnectionRefusedError,
             besapi.besapi.requests.exceptions.ConnectionError,
         ):
+            logging.exception(
+                "connection to `%s` failed, attempting `%s` instead",
+                rest_url,
+                args.besserver,
+            )
             try:
                 # print(args.besserver)
                 bes_conn = besapi.besapi.BESConnection(
@@ -159,8 +168,22 @@ def get_besapi_connection(args):
             # handle case where args.besserver is None
             # AttributeError: 'NoneType' object has no attribute 'startswith'
             except AttributeError:
-                bes_conn = besapi.besapi.get_bes_conn_using_config_file()
+                logging.exception("----- ERROR: BigFix Connection Failed ------")
+                logging.exception(
+                    "attempts to connect to BigFix using rest_url and besserver both failed"
+                )
+                return None
+            except BaseException as err:
+                # always log error and stop the current process
+                logging.exception("ERROR: %s", err)
+                logging.exception(
+                    "----- ERROR: BigFix Connection Failed! Unknown reason ------"
+                )
+                return None
     else:
+        logging.info(
+            "attempting connection to BigFix using config file method as user command arg was not provided"
+        )
         bes_conn = besapi.besapi.get_bes_conn_using_config_file()
 
     return bes_conn

{besapi-3.3.3 → besapi-3.4.2/src/besapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: besapi
-Version: 3.3.3
+Version: 3.4.2
 Summary: Library for working with the BigFix REST API
 Home-page: https://github.com/jgstew/besapi
 Author: Matt Hansen, James Stewart