From 679cd342bb6187a041a5a95d97090627eb2c9ab1 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 5 Sep 2013 20:30:32 +0000
Subject: [PATCH] Use the new tahrir notification callback in yet another
 place.

---
 roles/badges-backend/files/award-badge | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/roles/badges-backend/files/award-badge b/roles/badges-backend/files/award-badge
index 6a4cddc1c6..ebc685248a 100644
--- a/roles/badges-backend/files/award-badge
+++ b/roles/badges-backend/files/award-badge
@@ -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