Skip to content

Feat/logging format #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joachimprinzbach merged 7 commits into from
Feb 8, 2020
Merged

Feat/logging format #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4717653
Configure logging format
joachimprinzbach Feb 8, 2020
a7a8aa5
Fix linting
joachimprinzbach Feb 8, 2020
88eed91
Improve logging messages and format
joachimprinzbach Feb 8, 2020
2a4f268
Merge branch 'master' into feat/logging-format
joachimprinzbach Feb 8, 2020
da1624e
Simplify log format
joachimprinzbach Feb 8, 2020
73452e5
Improve preview log msgs
joachimprinzbach Feb 8, 2020
ce8b9a9
Reformat
joachimprinzbach Feb 8, 2020
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
3 changes: 1 addition & 2 deletions gitopscli/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@


def main():
logging.basicConfig(level=logging.INFO)

logging.basicConfig(level=logging.INFO, format="%(levelname)-2s %(funcName)s: %(message)s")
args = create_cli()

if args.command == "deploy":
Expand Down
15 changes: 5 additions & 10 deletions gitopscli/commands/create_preview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ def create_preview_command(
)

apps_git.checkout(branch)
logging.info("App repo %s checkout successfull", branch)
logging.info("App repo branch %s checkout successful", branch)
shortened_branch_hash = hashlib.sha256(branch.encode("utf-8")).hexdigest()[:8]
logging.info("Hashed branch %s to hash %s", branch, shortened_branch_hash)
logging.info("Hashed branch %s to hash: %s", branch, shortened_branch_hash)
gitops_config = GitOpsConfig(apps_git.get_full_file_path(".gitops.config.yaml"))
logging.info("Read GitOpsConfig: %s", gitops_config)

Expand All @@ -62,7 +62,7 @@ def create_preview_command(
root_tmp_dir,
)
root_git.checkout("master")
logging.info("Config repo master checkout successful")
logging.info("Config repo branch master checkout successful")
root_git.new_branch(branch)
logging.info("Created branch %s in config repo", branch)
preview_template_folder_name = ".preview-templates/" + gitops_config.application_name
Expand Down Expand Up @@ -92,14 +92,9 @@ def create_preview_command(
root_git.push(branch)
logging.info("Pushed branch %s", branch)
pr_comment_text = f"""
Preview created successfully. Access it [here](https://{route_host}).
Preview created successfully. Access it here: https://{route_host}.
"""
logging.info(
"Creating PullRequest comment for pr with id %s and parentComment with id %s and content: %s",
pr_id,
pr_comment_text,
parent_id,
)
logging.info("Creating PullRequest comment for pr with id %s and content: %s", pr_id, pr_comment_text)
apps_git.add_pull_request_comment(pr_id, pr_comment_text, parent_id)
finally:
shutil.rmtree(apps_tmp_dir, ignore_errors=True)
Expand Down