begin to switch to configparser
To not have unwanted environment influence
This commit is contained in:
		
					parent
					
						
							
								e459434b91
							
						
					
				
			
			
				commit
				
					
						6d0ce65f5c
					
				
			
		
					 2 changed files with 46 additions and 11 deletions
				
			
		|  | @ -3,10 +3,8 @@ | |||
| import argparse | ||||
| import logging | ||||
| import importlib | ||||
| 
 | ||||
| # For the exception | ||||
| import decouple | ||||
| import sys | ||||
| import os | ||||
| 
 | ||||
| COMMANDS = ['api', 'scheduler', 'host', 'filescanner', 'imagescanner', 'metadata'] | ||||
| 
 | ||||
|  | @ -15,20 +13,25 @@ if __name__ == "__main__": | |||
| 
 | ||||
|     arg_parser = argparse.ArgumentParser(prog='ucloud', | ||||
|                                          description='Open Source Cloud Management Software') | ||||
|     arg_parser.add_argument('-c', '--conf-dir', help="Configuration directory") | ||||
|     arg_parser.add_argument('component', choices=COMMANDS) | ||||
|     arg_parser.add_argument('component_args', nargs='*') | ||||
|     args = arg_parser.parse_args() | ||||
| 
 | ||||
|     try: | ||||
|         name = args.component | ||||
| 
 | ||||
|         mod = importlib.import_module("ucloud.{}.main".format(name)) | ||||
|         main = getattr(mod, "main") | ||||
| 
 | ||||
|         if args.conf_dir: | ||||
|             print("setting conf") | ||||
|             os.environ['UCLOUD_CONF_DIR'] = args.conf_dir | ||||
| 
 | ||||
|         main() | ||||
| 
 | ||||
|     except decouple.UndefinedValueError as e: | ||||
|         print(e) | ||||
|         sys.exit(1) | ||||
|     # except decouple.UndefinedValueError as e: | ||||
|     #     print(e) | ||||
|     #     sys.exit(1) | ||||
| 
 | ||||
|     except Exception as e: | ||||
|         logging.exception(e) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue