diff --git a/app/org/thp/cortex/controllers/JobCtrl.scala b/app/org/thp/cortex/controllers/JobCtrl.scala index 6e22c47a5..a51c08fe8 100644 --- a/app/org/thp/cortex/controllers/JobCtrl.scala +++ b/app/org/thp/cortex/controllers/JobCtrl.scala @@ -63,8 +63,8 @@ class JobCtrl @Inject() ( .map(_ ⇒ NoContent) } - def create(analyzerId: String): Action[Fields] = authenticated(Roles.analyze).async(fieldsBodyParser) { implicit request ⇒ - jobSrv.create(analyzerId, request.body) + def create(workerId: String): Action[Fields] = authenticated(Roles.analyze).async(fieldsBodyParser) { implicit request ⇒ + jobSrv.create(workerId, request.body) .map { job ⇒ renderer.toOutput(OK, job) } @@ -133,7 +133,6 @@ class JobCtrl @Inject() ( jobSrv.getForUser(request.userId, jobId) .flatMap { case job if job.status() == JobStatus.InProgress || job.status() == JobStatus.Waiting ⇒ - println(s"job status is ${job.status()} ⇒ wait") val duration = Duration(atMost).asInstanceOf[FiniteDuration] implicit val timeout: Timeout = Timeout(duration) (auditActor ? Register(jobId, duration)) @@ -142,7 +141,6 @@ class JobCtrl @Inject() ( .withTimeout(duration, ()) .flatMap(_ ⇒ getJobWithReport(request.userId, jobId)) case job ⇒ - println(s"job status is ${job.status()} ⇒ send it directly") getJobWithReport(request.userId, job) } .map(Ok(_)) diff --git a/app/org/thp/cortex/services/WorkerSrv.scala b/app/org/thp/cortex/services/WorkerSrv.scala index 37c59df5c..0d34301d2 100644 --- a/app/org/thp/cortex/services/WorkerSrv.scala +++ b/app/org/thp/cortex/services/WorkerSrv.scala @@ -224,8 +224,8 @@ class WorkerSrv( def create(organizationId: String, workerDefinition: WorkerDefinition, workerFields: Fields)(implicit authContext: AuthContext): Future[Worker] = { for { organization ← organizationSrv.get(organizationId) - analyzer ← create(organization, workerDefinition, workerFields) - } yield analyzer + worker ← create(organization, workerDefinition, workerFields) + } yield worker } def delete(analyzer: Worker)(implicit authContext: AuthContext): Future[Unit] =