[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[master 7/9] iscsi: consolidate logging in the UI



---
 pyanaconda/iw/advanced_storage.py  |    4 +---
 pyanaconda/partIntfHelpers.py      |    8 +++-----
 pyanaconda/textw/add_drive_text.py |    1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pyanaconda/iw/advanced_storage.py b/pyanaconda/iw/advanced_storage.py
index 39dfb2e..b3dc4b7 100644
--- a/pyanaconda/iw/advanced_storage.py
+++ b/pyanaconda/iw/advanced_storage.py
@@ -230,7 +230,6 @@ class iSCSIGuiWizard(pih.iSCSIWizard):
             gobject.TYPE_BOOLEAN,  # immutable
             gobject.TYPE_STRING    # node name
             )
-        log.debug("iscsi: adding %d nodes in nodes_dialog()" % len(found_nodes))
         map(lambda node : store.append(None, (
                     node,        # the object
                     True,        # visible
@@ -257,8 +256,6 @@ class iSCSIGuiWizard(pih.iSCSIWizard):
         rc = self._run_dialog(dialog)
         # filter out selected nodes:
         selected_nodes = map(lambda raw : raw[0], ds.getSelected())
-        map(lambda node: log.debug("iscsi: node selected for login: %s" % node.name),
-            selected_nodes)
         dialog.destroy()
         return (rc, selected_nodes)
 
@@ -397,6 +394,7 @@ def addIscsiDrive(anaconda):
     # make sure the network is up
     if not network.hasActiveNetDev():
         if not anaconda.intf.enableNetwork():
+            log.info("addIscsiDrive(): early exit, network disabled.")
             return gtk.RESPONSE_CANCEL
 
     wizard = iSCSIGuiWizard()
diff --git a/pyanaconda/partIntfHelpers.py b/pyanaconda/partIntfHelpers.py
index ad6edae..6109caf 100644
--- a/pyanaconda/partIntfHelpers.py
+++ b/pyanaconda/partIntfHelpers.py
@@ -461,9 +461,8 @@ def drive_iscsi_addition(anaconda, wizard):
                 anaconda.storage.iscsi.initiator = wizard.get_initiator()
                 discovery_dict = wizard.get_discovery_dict()
                 discovery_dict["intf"] = anaconda.intf
-                log.critical("discovering with %s" % discovery_dict)
                 found_nodes = anaconda.storage.iscsi.discover(**discovery_dict)
-                map(lambda node: log.info("discovered iSCSI node: %s" % node.name),
+                map(lambda node: log.debug("discovered iSCSI node: %s" % node.name),
                     found_nodes)
                 step = STEP_NODES
             elif step == STEP_NODES:
@@ -481,7 +480,6 @@ def drive_iscsi_addition(anaconda, wizard):
                 if not rc:
                     break
                 login_dict = wizard.get_login_dict()
-                log.critical("logging with %s" % login_dict)
                 login_dict["intf"] = anaconda.intf
                 login_fail_nodes = []
                 login_fail_msg = ""
@@ -508,12 +506,12 @@ def drive_iscsi_addition(anaconda, wizard):
                     step = STEP_NODES
 
         except (network.IPMissing, network.IPError) as msg:
-            log.debug("addIscsiDrive() cancelled due to an invalid IP address.")
+            log.info("addIscsiDrive() cancelled due to an invalid IP address.")
             anaconda.intf.messageWindow(_("iSCSI Error"), msg)
             if step != STEP_DISCOVERY:
                 break
         except (ValueError, IOError) as e:
-            log.debug("addIscsiDrive() IOError exception: %s" % e)
+            log.info("addIscsiDrive() IOError exception: %s" % e)
             step_str = _("Discovery") if step == STEP_DISCOVERY else _("Login")
             anaconda.intf.messageWindow(_("iSCSI %s Error") % step_str, str(e))
             break
diff --git a/pyanaconda/textw/add_drive_text.py b/pyanaconda/textw/add_drive_text.py
index 86f1571..8df9d12 100644
--- a/pyanaconda/textw/add_drive_text.py
+++ b/pyanaconda/textw/add_drive_text.py
@@ -407,6 +407,7 @@ class addDriveDialog(object):
                                "Must have a network configuration set up "
                                "for iSCSI config.  Please boot with "
                                "'linux asknetwork'")
+            log.info("addIscsiDriveDialog(): early exit, network disabled.")
             return INSTALL_BACK
 
         wizard = iSCSITextWizard(screen)
-- 
1.7.1.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]