Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions redisbench_admin/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,22 @@
LOG_DATEFMT = "%Y-%m-%d %H:%M:%S"


def populate_with_poetry_data():
def populate_with_project_data():
project_name = "redisbench-admin"
project_version = __version__
project_description = None
try:
poetry_data = toml.load("pyproject.toml")["tool"]["poetry"]
project_name = poetry_data["name"]
project_version = poetry_data["version"]
project_description = poetry_data["description"]
pyproject_toml = toml.load("pyproject.toml")
if 'project' in pyproject_toml:
project_data = pyproject_toml["project"]
project_name = project_data["name"]
project_version = project_data["version"]
project_description = project_data.get("description")
else:
poetry_data = pyproject_toml["tool"]["poetry"]
project_name = poetry_data["name"]
project_version = poetry_data["version"]
project_description = poetry_data["description"]
except FileNotFoundError:
pass

Expand All @@ -59,7 +66,7 @@ def main():
)
sys.exit(1)
requested_tool = sys.argv[1]
project_name, project_description, project_version = populate_with_poetry_data()
project_name, project_description, project_version = populate_with_project_data()
parser = argparse.ArgumentParser(
description=project_description,
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
Expand Down
4 changes: 2 additions & 2 deletions redisbench_admin/profilers/daemon.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import daemonize
from flask import Flask, request

from redisbench_admin.cli import populate_with_poetry_data
from redisbench_admin.cli import populate_with_project_data
from redisbench_admin.profilers.perf import Perf
from redisbench_admin.profilers.perf_daemon_caller import PERF_DAEMON_LOGNAME
from redisbench_admin.profilers.profilers_local import local_profilers_platform_checks
Expand Down Expand Up @@ -282,7 +282,7 @@ def profile_stop(profiler_name, pid):


def main():
_, project_description, project_version = populate_with_poetry_data()
_, project_description, project_version = populate_with_project_data()
project_name = "perf-daemon"
parser = argparse.ArgumentParser(
description=project_description,
Expand Down