summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul C. Buetow <paul@buetow.org>2014-04-16 08:06:08 +0200
committerPaul C. Buetow <paul@buetow.org>2014-04-16 08:06:08 +0200
commit50bf405eda62839b1d28dd7c6421be35abd7ee87 (patch)
tree5a8568c90d9db0943da40fe5300aa281bb1cbc45 /src
parent4603689886c353d6ab3e26f9a42e7e4398a7febf (diff)
fix print_version and remove ./-m switch
Diffstat (limited to 'src')
-rwxr-xr-xsrc/fapi9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/fapi b/src/fapi
index 0d0d3fb..0971d5f 100755
--- a/src/fapi
+++ b/src/fapi
@@ -20,12 +20,14 @@ __program__ = 'fapi'
__version__ = 'VERSION_DEVEL' # Replaced by a Makefile tsubet
__prompt__ = '>>>' # Default prompt
+def print_version():
+ print 'This is %s version %s' % (__program__, __version__)
def print_synopsis():
''' Prints the full Synopsis string '''
+ print_version()
print "\n".join([
- 'This is %s version %s' % (__program__, __version__),
'',
'Synopsis:',
' fapi monitor',
@@ -230,7 +232,7 @@ class Fapi(object):
elif a.sub == 'create':
poolmembers = []
- method = a.m
+ method = 'LB_METHOD_ROUND_ROBIN'
if a.sub3:
for x in a.sub3.split(','):
fqdn, ip, port = self.lookup(x)
@@ -434,8 +436,6 @@ if __name__ == '__main__':
parser.add_argument('-h', action='store_true', help='Help')
parser.add_argument('-v', action='store_true', help='Verbose')
parser.add_argument('-V', action='store_true', help='Print version')
- parser.add_argument('-m', action='store', help='The default lbmethod',
- default='LB_METHOD_ROUND_ROBIN')
parser.add_argument('-C', action='store', help='Config file',
default=expanduser('~') + '/.fapi.conf')
@@ -456,6 +456,7 @@ if __name__ == '__main__':
sys.exit(0)
if args.V:
+ print_version()
sys.exit(0)
fapi = Fapi(args)