Merge pull request #18 from diggyk/master

Change Slack notifications
dropbox · Jun 20, 2015 · ca02731 · ca02731
2 parents 268fdfb + 405e446
commit ca02731
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/hermes/models.py b/hermes/models.py
@@ -845,11 +845,11 @@ def create(
             session.rollback()
             raise
 
-        slack_message("*Event:* {} = {} {}".format(
-            event.host.hostname,
-            event.event_type.category,
-            event.event_type.state
-        ))
+        # slack_message("*Event:* {} = {} {}".format(
+        #     event.host.hostname,
+        #     event.event_type.category,
+        #     event.event_type.state
+        # ))
 
         Fate.question_the_fates(session, [event], quest=quest)
 
@@ -874,7 +874,7 @@ def create_many(cls, session, events, tx, quest=None):
         log.info("Created {} events".format(len(events)))
 
 
-        slack_message("*Events:* created {} events".format(len(events)))
+        # slack_message("*Events:* created {} events".format(len(events)))
 
         Fate.question_the_fates(session, events, quest=quest)
 
@@ -1201,12 +1201,15 @@ def achieve_many(cls, session, labor_dicts):
                 flush=False, commit=False
             )
 
-            slack_message("*Labor {}* completed.\n\t{}: {} {} => {} {}".format(
+            slack_message("*Labor {}* completed.\n\t{}: {} {} => {} {}{}".format(
                 labor.id, labor.host.hostname,
                 labor.creation_event.event_type.category,
                 labor.creation_event.event_type.state,
                 labor.completion_event.event_type.category,
-                labor.completion_event.event_type.state
+                labor.completion_event.event_type.state,
+                "\n\tPart of Quest [{}] \"{}\"".format(
+                    labor.quest_id, labor.quest.description
+                ) if labor.quest_id else ""
             ))
             if labor.quest and labor.quest not in quests:
                 quests.append(labor.quest)