almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

lorax-composer: Drop unneeded parameters and create missing directories

Browse Source 
The log directory (and parents) will be created if they are missing.
An empty recipe directory will be created if it doesn't exist.
This commit is contained in:
Brian C. Lane 2017-11-15 09:56:52 -08:00
parent d701120d90
commit 453082ab9f
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/sbin/lorax-composer
View File

@ -37,8 +37,8 @@ VERSION = "{0}-{1}".format(os.path.basename(sys.argv[0]), vernum)
def get_parser(): def get_parser():
""" Return the ArgumentParser for lorax-composer""" """ Return the ArgumentParser for lorax-composer"""
parser = argparse.ArgumentParser( description="Composer API Server", parser = argparse.ArgumentParser(description="Lorax Composer API Server",
fromfile_prefix_chars="@" ) fromfile_prefix_chars="@")
parser.add_argument("--host", default="127.0.0.1", metavar="HOST", parser.add_argument("--host", default="127.0.0.1", metavar="HOST",
help="Host or IP to bind to (127.0.0.1)") help="Host or IP to bind to (127.0.0.1)")
@ -48,12 +48,8 @@ def get_parser():
help="Path to logfile (/var/log/lorax-composer/composer.log)") help="Path to logfile (/var/log/lorax-composer/composer.log)")
parser.add_argument("--mockfiles", default="/var/tmp/bdcs-mockfiles/", metavar="MOCKFILES", parser.add_argument("--mockfiles", default="/var/tmp/bdcs-mockfiles/", metavar="MOCKFILES",
help="Path to JSON files used for /api/mock/ paths (/var/tmp/bdcs-mockfiles/)") help="Path to JSON files used for /api/mock/ paths (/var/tmp/bdcs-mockfiles/)")
parser.add_argument("--bdcs", default="/mddb/cs.repo", metavar="BDCS",
help="Path to the content store directory (/mddb/cs.repo)")
parser.add_argument("-V", action="store_true", dest="showver", parser.add_argument("-V", action="store_true", dest="showver",
help="show program's version number and exit") help="show program's version number and exit")
parser.add_argument("DB", metavar="DATABASE",
help="Path to the BDCS sqlite database")
parser.add_argument("RECIPES", metavar="RECIPES", parser.add_argument("RECIPES", metavar="RECIPES",
help="Path to the recipes") help="Path to the recipes")
@ -95,19 +91,15 @@ if __name__ == '__main__':
print(VERSION) print(VERSION)
sys.exit(0) sys.exit(0)
errors = [] logpath = os.path.abspath(os.path.dirname(opts.logfile))
if not os.path.exists(opts.DB): if not os.path.isdir(logpath):
errors.append("Database, %s, doesn't exist." % opts.DB) os.makedirs(logpath)
if not os.path.exists(opts.RECIPES):
errors.append("Recipe directory, %s, is missing." % opts.RECIPES)
for e in errors:
print("ERROR: " + e)
if errors:
sys.exit(1)
setup_logging(opts.logfile) setup_logging(opts.logfile)
if not os.path.isdir(opts.RECIPES):
log.warn("Creating empty recipe directory at %s", opts.RECIPES)
os.makedirs(opts.RECIPES)
server.config["REPO_DIR"] = opts.RECIPES server.config["REPO_DIR"] = opts.RECIPES
repo = open_or_create_repo(server.config["REPO_DIR"]) repo = open_or_create_repo(server.config["REPO_DIR"])
server.config["GITLOCK"] = GitLock(repo=repo, lock=Lock(), dir=opts.RECIPES) server.config["GITLOCK"] = GitLock(repo=repo, lock=Lock(), dir=opts.RECIPES)