From 430695a93fbbc38d2927093c36621ea0ae3b4ad4 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 23 Aug 2013 14:45:47 +0000 Subject: [PATCH] Only initialize all the things until after we checked CLI arguments. --- roles/badges-backend/files/award-badge | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/roles/badges-backend/files/award-badge b/roles/badges-backend/files/award-badge index 6948c257e7..840f4fdd9d 100644 --- a/roles/badges-backend/files/award-badge +++ b/roles/badges-backend/files/award-badge @@ -18,12 +18,6 @@ from tahrir_api.dbapi import TahrirDatabase import fedmsg import fedmsg.config -fm_config = fedmsg.config.load_config() -fm_config['cert_prefix'] = 'fedbadges' -fm_config['name'] = 'relay_inbound' -fm_config['active'] = True -fedmsg.init(**fm_config) - def parse_args(): parser = argparse.ArgumentParser(__doc__) @@ -39,6 +33,17 @@ def parse_args(): return args +def initialize(): + fm_config = fedmsg.config.load_config() + fm_config['cert_prefix'] = 'fedbadges' + fm_config['name'] = 'relay_inbound' + fm_config['active'] = True + fedmsg.init(**fm_config) + uri = fm_config['badges_global']['database_uri'] + tahrir = TahrirDatabase(uri) + return tahrir + + def main(tahrir, nickname, badge_id): person = tahrir.get_person(nickname=nickname) badge = tahrir.get_badge(badge_id) @@ -82,6 +87,5 @@ def main(tahrir, nickname, badge_id): if __name__ == '__main__': args = parse_args() - uri = fm_config['badges_global']['database_uri'] - tahrir = TahrirDatabase(uri) + tahrir = initialize() main(tahrir, username, badge_id)