Merge pull request #1699 from mesosphere/mv/event_info

Fixes #650. Add deployment plan to DeploymentSuccess/DeploymentFailed.
mesosphere · Jul 1, 2015 · c0e3af1 · c0e3af1
2 parents 98f9a6c + 9d22f8f
commit c0e3af1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/scala/mesosphere/marathon/MarathonSchedulerActor.scala b/src/main/scala/mesosphere/marathon/MarathonSchedulerActor.scala
@@ -293,14 +293,14 @@ class MarathonSchedulerActor private (
 
   def deploymentSuccess(plan: DeploymentPlan): Unit = {
     log.info(s"Deployment of ${plan.target.id} successful")
-    eventBus.publish(DeploymentSuccess(plan.id))
+    eventBus.publish(DeploymentSuccess(plan.id, plan))
     deploymentRepository.expunge(plan.id)
   }
 
   def deploymentFailed(plan: DeploymentPlan, reason: Throwable): Unit = {
     log.error(reason, s"Deployment of ${plan.target.id} failed")
     plan.affectedApplicationIds.foreach(appId => taskQueue.purge(appId))
-    eventBus.publish(DeploymentFailed(plan.id))
+    eventBus.publish(DeploymentFailed(plan.id, plan))
     if (reason.isInstanceOf[DeploymentCanceledException])
       deploymentRepository.expunge(plan.id)
   }

diff --git a/src/main/scala/mesosphere/marathon/event/Events.scala b/src/main/scala/mesosphere/marathon/event/Events.scala
@@ -169,11 +169,13 @@ case class GroupChangeFailed(
 
 case class DeploymentSuccess(
   id: String,
+  plan: DeploymentPlan,
   eventType: String = "deployment_success",
   timestamp: String = Timestamp.now().toString) extends UpgradeEvent
 
 case class DeploymentFailed(
   id: String,
+  plan: DeploymentPlan,
   eventType: String = "deployment_failed",
   timestamp: String = Timestamp.now().toString) extends UpgradeEvent