YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Connection bug fix

Browse source
This commit is contained in:
Kloadut 2012-10-14 17:01:54 +02:00
parent 1d20ac2031
commit 4f5961f413
1 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
parse_args
View file

@ -66,7 +66,7 @@ Documentation:
Don't forget to turn argument as dictionnary ('setting' : 'value') Don't forget to turn argument as dictionnary ('setting' : 'value')
""" """
action_dict = { action_map = {
############################# #############################
# General args # # General args #
############################# #############################
@ -261,7 +261,6 @@ action_dict = {
### domain_renewcert() ### domain_renewcert()
'renewcert' : { 'renewcert' : {
'action_help' : _("Renew domain certificate"), 'action_help' : _("Renew domain certificate"),
'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'domain-name' : {} 'domain-name' : {}
} }
@ -419,28 +418,24 @@ action_dict = {
} }
} }
def parse_dict(action_dict): def parse_dict(action_map):
""" """
Turn action dictionnary to parser, subparsers and arguments Turn action dictionnary to parser, subparsers and arguments
Keyword arguments: Keyword arguments:
action_dict -- Multi-level dictionnary of categories/actions/arguments list action_map -- Multi-level dictionnary of categories/actions/arguments list
Returns: Returns:
Namespace of args Namespace of args
""" """
# Connections
connections_available = ['ldap', 'repo', 'dns', 'firewall']
connections_enabled = []
# Intialize parsers # Intialize parsers
parsers = subparsers_category = subparsers_action = {} parsers = subparsers_category = subparsers_action = {}
parsers['general'] = argparse.ArgumentParser() parsers['general'] = argparse.ArgumentParser()
subparsers = parsers['general'].add_subparsers() subparsers = parsers['general'].add_subparsers()
# Add general arguments # Add general arguments
for arg_name, arg_params in action_dict['general_arguments'].items(): for arg_name, arg_params in action_map['general_arguments'].items():
if arg_params['full']: if arg_params['full']:
arg_fullname = arg_params['full'] arg_fullname = arg_params['full']
del arg_params['full'] del arg_params['full']
@ -448,21 +443,16 @@ def parse_dict(action_dict):
else: else:
parsers['general'].add_argument(arg_name, **arg_params) parsers['general'].add_argument(arg_name, **arg_params)
del action_dict['general_arguments'] del action_map['general_arguments']
# Split categories into subparsers # Split categories into subparsers
for category, category_params in action_dict.items(): for category, category_params in action_map.items():
if 'category_help' not in category_params: category_params['category_help'] = '' if 'category_help' not in category_params: category_params['category_help'] = ''
subparsers_category[category] = subparsers.add_parser(category, help=category_params['category_help']) subparsers_category[category] = subparsers.add_parser(category, help=category_params['category_help'])
subparsers_action[category] = subparsers_category[category].add_subparsers() subparsers_action[category] = subparsers_category[category].add_subparsers()
# Split actions # Split actions
if 'actions' in category_params: if 'actions' in category_params:
for action, action_params in category_params['actions'].items(): for action, action_params in category_params['actions'].items():
# Connections settings
if 'connections' in action_params:
for connection in connections_available:
if connection in action_params['connections']:
connections_enabled.append(connection)
if 'action_help' not in action_params: action_params['action_help'] = '' if 'action_help' not in action_params: action_params['action_help'] = ''
parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help=action_params['action_help']) parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help=action_params['action_help'])
# Set the action s related function # Set the action s related function
@ -479,8 +469,7 @@ def parse_dict(action_dict):
else: else:
parsers[category + '_' + action].add_argument(arg_name, **arg_params) parsers[category + '_' + action].add_argument(arg_name, **arg_params)
args = parsers['general'].parse_args() return { 'category' : sys.argv[1], 'action' : sys.argv[2], 'args' : parsers['general'].parse_args() }
return { 'connections' : connections_enabled, 'args' : args }
def display_error(error): def display_error(error):
""" """
@ -505,14 +494,19 @@ def main():
int -- 0 or error code int -- 0 or error code
""" """
action = parse_dict(action_dict) parsed = parse_dict(action_map)
action_dict = action_map[parsed['category']]['actions'][parsed['action']]
connections = {} connections = {}
required_connections = []
if 'connections' in action_dict:
required_connections = action_dict['connections']
try: try:
# Connect to different services if the action is requiring it # Connect to different services if the action is requiring it
if 'ldap' in action['connections']: if 'ldap' in required_connections:
connections['ldap'] = YunoHostLDAP() connections['ldap'] = YunoHostLDAP()
if 'firewall' in action['connections']: if 'firewall' in required_connections:
connections['firewall'] = open('/etc/init.d/iptables', 'w') connections['firewall'] = open('/etc/init.d/iptables', 'w')
# TODO: Add other services connections # TODO: Add other services connections
except YunoHostError, error: except YunoHostError, error:
@ -521,9 +515,9 @@ def main():
try: try:
if connections: if connections:
result = action['args'].func(vars(action['args']), connections) result = parsed['args'].func(vars(parsed['args']), connections)
else: else:
result = action['args'].func(vars(action['args'])) result = parsed['args'].func(vars(parsed['args']))
except TypeError: except TypeError:
print(_("Not (yet) implemented function")) print(_("Not (yet) implemented function"))
return 1 return 1
@ -536,9 +530,9 @@ def main():
else: else:
print(json.dumps(result)) print(json.dumps(result))
finally: finally:
if 'ldap' in action['connections']: if 'ldap' in required_connections:
connections['ldap'].disconnect() connections['ldap'].disconnect()
if 'firewall' in action['connections']: if 'firewall' in required_connections:
connections['firewall'].close() connections['firewall'].close()
# TODO: Add other services deconnections # TODO: Add other services deconnections
return 0 return 0