diff --git a/longbow/corelibs/configuration.py b/longbow/corelibs/configuration.py index b2b2595..b79136a 100755 --- a/longbow/corelibs/configuration.py +++ b/longbow/corelibs/configuration.py @@ -138,24 +138,12 @@ def processconfigs(parameters): """ # Try and load the host file. - try: - - _, hostsections, hostdata = loadconfigs(parameters["hosts"]) - - except exceptions.ConfigurationError: - - raise + _, hostsections, hostdata = loadconfigs(parameters["hosts"]) # If we have been given a job file then try and load it. if parameters["job"] is not "": - try: - - _, _, jobdata = loadconfigs(parameters["job"]) - - except exceptions.ConfigurationError: - - raise + _, _, jobdata = loadconfigs(parameters["job"]) # If there is no job file, then attempt to build a job from other sources. else: diff --git a/longbow/schedulers/lsf.py b/longbow/schedulers/lsf.py index 36da888..ce2144b 100755 --- a/longbow/schedulers/lsf.py +++ b/longbow/schedulers/lsf.py @@ -190,13 +190,7 @@ def status(job): jobstate = "" - try: - - shellout = shellwrappers.sendtossh(job, ["bjobs -u " + job["user"]]) - - except exceptions.SSHError: - - raise + shellout = shellwrappers.sendtossh(job, ["bjobs -u " + job["user"]]) # PBS will return a table, so split lines into a list. stdout = shellout[0].split("\n") diff --git a/longbow/schedulers/pbs.py b/longbow/schedulers/pbs.py index ec796c8..1a68707 100755 --- a/longbow/schedulers/pbs.py +++ b/longbow/schedulers/pbs.py @@ -238,13 +238,7 @@ def status(job): jobstate = "" - try: - - shellout = shellwrappers.sendtossh(job, ["qstat -u " + job["user"]]) - - except exceptions.SSHError: - - raise + shellout = shellwrappers.sendtossh(job, ["qstat -u " + job["user"]]) # PBS will return a table, so split lines into a list. stdout = shellout[0].split("\n") diff --git a/longbow/schedulers/sge.py b/longbow/schedulers/sge.py index 172f911..969cb3d 100755 --- a/longbow/schedulers/sge.py +++ b/longbow/schedulers/sge.py @@ -181,13 +181,7 @@ def status(job): jobstate = "" - try: - - shellout = shellwrappers.sendtossh(job, ["qstat -u " + job["user"]]) - - except exceptions.SSHError: - - raise + shellout = shellwrappers.sendtossh(job, ["qstat -u " + job["user"]]) # PBS will return a table, so split lines into a list. stdout = shellout[0].split("\n") diff --git a/longbow/schedulers/slurm.py b/longbow/schedulers/slurm.py index 256e090..6de9ff9 100755 --- a/longbow/schedulers/slurm.py +++ b/longbow/schedulers/slurm.py @@ -196,13 +196,7 @@ def status(job): jobstate = "" - try: - - shellout = shellwrappers.sendtossh(job, ["squeue -u " + job["user"]]) - - except exceptions.SSHError: - - raise + shellout = shellwrappers.sendtossh(job, ["squeue -u " + job["user"]]) # PBS will return a table, so split lines into a list. stdout = shellout[0].split("\n") diff --git a/longbow/schedulers/soge.py b/longbow/schedulers/soge.py index e427de3..97e096e 100755 --- a/longbow/schedulers/soge.py +++ b/longbow/schedulers/soge.py @@ -198,13 +198,7 @@ def status(job): jobstate = "" - try: - - shellout = shellwrappers.sendtossh(job, ["qstat -u " + job["user"]]) - - except exceptions.SSHError: - - raise + shellout = shellwrappers.sendtossh(job, ["qstat -u " + job["user"]]) # PBS will return a table, so split lines into a list. stdout = shellout[0].split("\n")