Merge branch 'beta' of ssh://github.com/prisma/prisma into beta

# Conflicts: # server/servers/deploy/src/main/scala/com/prisma/deploy/migration/migrator/AsyncMigrator.scala # server/servers/deploy/src/main/scala/com/prisma/deploy/migration/migrator/DeploymentSchedulerActor.scala # server/servers/deploy/src/main/scala/com/prisma/deploy/migration/migrator/ProjectDeploymentActor.scala
fuath · Feb 2, 2019 · 8aeb814 · 8aeb814
2 parents f97f936 + 76e6155
commit 8aeb814
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/...deploy/src/main/scala/com/prisma/deploy/migration/migrator/DeploymentSchedulerActor.scala b/...deploy/src/main/scala/com/prisma/deploy/migration/migrator/DeploymentSchedulerActor.scala
@@ -72,7 +72,6 @@ case class DeploymentSchedulerActor(
     workerRef.tell(scheduleMsg, sender)
   }
 
-<<<<<<< HEAD
   def workerForProject(projectId: String) = {
     projectPersistence.load(projectId).onComplete {
       case Success(Some(project)) => this.context.self ! project
@@ -81,11 +80,7 @@ case class DeploymentSchedulerActor(
   }
 
   def workerForProject(project: Project): ActorRef = {
-    val newWorker = context.actorOf(Props(ProjectDeploymentActor(project, migrationPersistence, deployConnector)))
-=======
-  def workerForProject(projectId: String): ActorRef = {
-    val newWorker = context.actorOf(Props(ProjectDeploymentActor(projectId, migrationPersistence, deployConnector, invalidationPublisher)))
->>>>>>> master
+    val newWorker = context.actorOf(Props(ProjectDeploymentActor(project, migrationPersistence, deployConnector, invalidationPublisher)))
 
     context.watch(newWorker)
     projectWorkers += (project -> newWorker)

diff --git a/...s/deploy/src/main/scala/com/prisma/deploy/migration/migrator/ProjectDeploymentActor.scala b/...s/deploy/src/main/scala/com/prisma/deploy/migration/migrator/ProjectDeploymentActor.scala
@@ -159,7 +159,7 @@ case class ProjectDeploymentActor(
           if (result.succeeded) {
             activeSchema = nextMigration.schema
           }
-          invalidationPublisher.publish(Only(projectId), projectId)
+          invalidationPublisher.publish(Only(project.id), project.id)
         }
 
       case Failure(err) =>