Gitweb:
http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=c73752...
Commit: c737522f0bd8e5663b7d57a62528c78ce002aefe
Parent: a5a8c1fae0a55ef6d4558e83bffd4c9c04fcd559
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Nov 5 16:28:38 2012 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Thu Nov 8 10:20:31 2012 +0100
fencing: Simplify exceptions catching when closing connection
When we are closing connection we do not care about exceptions. For example
if action 'exit' failed, fencing is succesful anyway because our goal was to fence
machine.
---
fence/agents/alom/fence_alom.py | 4 +---
fence/agents/apc/fence_apc.py | 4 +---
fence/agents/bladecenter/fence_bladecenter.py | 4 +---
fence/agents/drac5/fence_drac5.py | 4 +---
fence/agents/hpblade/fence_hpblade.py | 4 +---
fence/agents/ilo_mp/fence_ilo_mp.py | 4 +---
fence/agents/lpar/fence_lpar.py | 4 +---
fence/agents/rsa/fence_rsa.py | 4 +---
fence/agents/rsb/fence_rsb.py | 4 +---
fence/agents/virsh/fence_virsh.py | 4 +---
fence/agents/wti/fence_wti.py | 4 +---
11 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py
index abe0a1a..f1810d2 100644
--- a/fence/agents/alom/fence_alom.py
+++ b/fence/agents/alom/fence_alom.py
@@ -57,9 +57,7 @@ agent which can be used with ALOM connected machines."
try:
conn.send_eol("logout")
conn.close()
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index 9236a30..e98d9ce 100644
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -217,9 +217,7 @@ will block any necessary fencing actions."
try:
conn.send_eol("4")
conn.close()
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)
diff --git a/fence/agents/bladecenter/fence_bladecenter.py
b/fence/agents/bladecenter/fence_bladecenter.py
index cf38e10..2a0caf9 100644
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -110,9 +110,7 @@ and uses the command line interface to power on and off blades."
try:
conn.send_eol("exit")
conn.close()
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)
diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py
index bce8cef..47d8db7 100644
--- a/fence/agents/drac5/fence_drac5.py
+++ b/fence/agents/drac5/fence_drac5.py
@@ -114,9 +114,7 @@ By default, the telnet interface is not enabled."
conn.send_eol("exit")
time.sleep(1)
conn.close()
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)
diff --git a/fence/agents/hpblade/fence_hpblade.py
b/fence/agents/hpblade/fence_hpblade.py
index 6532065..6cea46a 100644
--- a/fence/agents/hpblade/fence_hpblade.py
+++ b/fence/agents/hpblade/fence_hpblade.py
@@ -88,9 +88,7 @@ and uses the command line interface to power on and off blades."
try:
conn.send_eol("exit")
conn.close()
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)
diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py
index 85764c6..1e14935 100644
--- a/fence/agents/ilo_mp/fence_ilo_mp.py
+++ b/fence/agents/ilo_mp/fence_ilo_mp.py
@@ -61,9 +61,7 @@ def main():
try:
conn.send_eol("exit")
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index 0bae359..252a659 100644
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -138,10 +138,8 @@ def main():
try:
conn.send("quit\r\n")
conn.close()
- except exceptions.OSError:
+ except:
pass
- except pexpect.ExceptionPexpect:
- pass
sys.exit(result)
if __name__ == "__main__":
diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py
index e1e303f..578e34d 100644
--- a/fence/agents/rsa/fence_rsa.py
+++ b/fence/agents/rsa/fence_rsa.py
@@ -70,9 +70,7 @@ will block any necessary fencing actions."
try:
conn.send_eol("exit")
conn.close()
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)
diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py
index 395a844..87ed53a 100755
--- a/fence/agents/rsb/fence_rsb.py
+++ b/fence/agents/rsb/fence_rsb.py
@@ -88,9 +88,7 @@ will block any necessary fencing actions."
try:
conn.send_eol("0")
conn.close()
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)
diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py
index b157385..113de8f 100644
--- a/fence/agents/virsh/fence_virsh.py
+++ b/fence/agents/virsh/fence_virsh.py
@@ -91,9 +91,7 @@ must allow ssh login in your sshd_config."
try:
conn.sendline("quit")
conn.close()
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
index 80b5e96..063352e 100644
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -151,9 +151,7 @@ is running because the connection will block any necessary fencing
actions."
try:
conn.send("/X"+"\r\n")
conn.close()
- except exceptions.OSError:
- pass
- except pexpect.ExceptionPexpect:
+ except:
pass
sys.exit(result)