Use the new tahrir notification callback in yet another place.
This commit is contained in:
parent
a3f009754b
commit
679cd342bb
1 changed files with 6 additions and 14 deletions
|
@ -18,6 +18,8 @@ from tahrir_api.dbapi import TahrirDatabase
|
|||
import fedmsg
|
||||
import fedmsg.config
|
||||
|
||||
import fedbadges.utils
|
||||
|
||||
|
||||
def parse_args():
|
||||
parser = argparse.ArgumentParser(__doc__)
|
||||
|
@ -40,7 +42,10 @@ def initialize():
|
|||
fm_config['active'] = True
|
||||
fedmsg.init(**fm_config)
|
||||
uri = fm_config['badges_global']['database_uri']
|
||||
tahrir = TahrirDatabase(uri)
|
||||
tahrir = TahrirDatabase(
|
||||
uri,
|
||||
notification_callback=fedbadges.utils.notification_callback,
|
||||
)
|
||||
return tahrir
|
||||
|
||||
|
||||
|
@ -67,19 +72,6 @@ def main(tahrir, nickname, badge_id):
|
|||
transaction.begin()
|
||||
tahrir.add_assertion(badge.id, person.email, None)
|
||||
transaction.commit()
|
||||
fedmsg.publish(topic="badge.award",
|
||||
modname="fedbadges",
|
||||
msg=dict(
|
||||
badge=dict(
|
||||
name=badge.name,
|
||||
description=badge.description,
|
||||
image_url=badge.image,
|
||||
),
|
||||
user=dict(
|
||||
username=person.nickname,
|
||||
badges_user_id=person.id,
|
||||
),
|
||||
))
|
||||
except Exception as e:
|
||||
transaction.abort()
|
||||
print "Failure:", e
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue