Skip to content

Commit

Permalink
Moving init funcs from utils/cli.py and utils/log.py to alamalinux_si…
Browse files Browse the repository at this point in the history
…gn_node.py

Also, unused utils/test_utils.py was deleted.
  • Loading branch information
Igor Sudak committed Apr 23, 2024
1 parent a45b22f commit e1f5a2e
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 296 deletions.
48 changes: 41 additions & 7 deletions almalinux_sign_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,42 @@
CloudLinux Build System builds sign node.
"""

import argparse
import logging
import sys

import sentry_sdk

from sign_node.errors import ConfigurationError
from sign_node.config import SignNodeConfig
from sign_node.cli import init_args_parser, init_working_dir
from sign_node.errors import ConfigurationError
from sign_node.signer import Signer
from sign_node.utils.config import locate_config_file
from sign_node.utils.log import configure_logger
from sign_node.utils.pgp_utils import init_gpg, PGPPasswordDB
from sign_node.utils.file_utils import clean_dir, safe_mkdir
from sign_node.utils.pgp_utils import PGPPasswordDB, init_gpg


def init_arg_parser():
parser = argparse.ArgumentParser(
prog="sign_node", description="CloudLinux Build System builds sign node"
)
parser.add_argument("-c", "--config", help="configuration file path")
parser.add_argument(
"-v", "--verbose", action="store_true", help="enable additional debug output"
)
return parser


def init_logger(verbose):
level = logging.DEBUG if verbose else logging.INFO
handler = logging.StreamHandler()
handler.setLevel(level)
log_format = "%(asctime)s %(levelname)-8s [%(threadName)s]: %(message)s"
formatter = logging.Formatter(log_format, "%y.%m.%d %H:%M:%S")
handler.setFormatter(formatter)
logger = logging.getLogger()
logger.addHandler(handler)
logger.setLevel(level)
return logger


def init_sentry(config: SignNodeConfig):
Expand All @@ -30,10 +55,19 @@ def init_sentry(config: SignNodeConfig):
)


def init_working_dir(config):
working_dir = config.working_dir
if not safe_mkdir(working_dir):
logging.debug("cleaning up the %s working directory", working_dir)
clean_dir(working_dir)
else:
logging.debug("working directory %s was created", working_dir)


def main():
args_parser = init_args_parser()
args_parser = init_arg_parser()
args = args_parser.parse_args()
logger = configure_logger(args.verbose)
logger = init_logger(args.verbose)
try:
config_file = locate_config_file('sign_node', args.config)
logger.debug("Loading %s", config_file if config_file else 'default configuration')
Expand All @@ -55,7 +89,7 @@ def main():
except ConfigurationError as e:
args_parser.error(str(e))

init_working_dir(config.working_dir)
init_working_dir(config)

signer = Signer(config, password_db, gpg)
signer.sign_loop()
Expand Down
52 changes: 0 additions & 52 deletions sign_node/cli.py

This file was deleted.

73 changes: 0 additions & 73 deletions sign_node/utils/log.py

This file was deleted.

164 changes: 0 additions & 164 deletions sign_node/utils/test_utils.py

This file was deleted.

0 comments on commit e1f5a2e

Please sign in to comment.