Re: [nfs-utils PATCH] mountstats: Fix exit code handling

[Steve Dickson <SteveD@redhat.com>]

On 03/02/2015 03:00 PM, Scott Mayhew wrote:
> When I changed mountstats to use the argparse module, I neglected to
> make the subcommand functions return any values even though main() was
> looking for them.  Also removed SystemExit from the except clause at
> the end of the program since it was causing the program to always exit
> with a status of 1.
> 
> Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Committed...

steved.

> ---
>  tools/mountstats/mountstats.py | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
> index fd73feb..7f5dee1 100644
> --- a/tools/mountstats/mountstats.py
> +++ b/tools/mountstats/mountstats.py
> @@ -708,7 +708,7 @@ def mountstats_command(args):
>                  mountpoints += [device]
>      if len(mountpoints) == 0:
>          print('No NFS mount points were found')
> -        return
> +        return 1
>  
>      if args.since:
>          old_mountstats = parse_stats_file(args.since)
> @@ -729,6 +729,7 @@ def mountstats_command(args):
>      args.infile.close()
>      if args.since:
>          args.since.close()
> +    return 0
>  
>  def nfsstat_command(args):
>      """nfsstat-like command for NFS mount points
> @@ -766,7 +767,7 @@ def nfsstat_command(args):
>                  mountpoints += [device]
>      if len(mountpoints) == 0:
>          print('No NFS mount points were found')
> -        return
> +        return 1
>  
>      if args.since:
>          old_mountstats = parse_stats_file(args.since)
> @@ -803,6 +804,7 @@ def nfsstat_command(args):
>      args.infile.close()
>      if args.since:
>          args.since.close()
> +    return 0
>  
>  def print_iostat_summary(old, new, devices, time):
>      for device in devices:
> @@ -847,7 +849,7 @@ def iostat_command(args):
>                  devices += [device]
>      if len(devices) == 0:
>          print('No NFS mount points were found')
> -        return
> +        return 1
>  
>      sample_time = 0
>  
> @@ -875,6 +877,7 @@ def iostat_command(args):
>      args.infile.close()
>      if args.since:
>          args.since.close()
> +    return 0
>  
>  class ICMAction(argparse.Action):
>      """Custom action to deal with interval, count, and mountpoints.
> @@ -986,7 +989,7 @@ try:
>          sys.stdout.close()
>          sys.stderr.close()
>          sys.exit(res)
> -except (SystemExit, KeyboardInterrupt, RuntimeError):
> +except (KeyboardInterrupt, RuntimeError):
>      sys.exit(1)
>  except IOError:
>      pass
> -- 1.9.3
>