Commit 795df314 authored by Leonardo Menezes's avatar Leonardo Menezes
Browse files

support for host name 

closes #58
parent b1f17360

app/controllers/AliasesController.scala

+2 −1
Original line number Diff line number Diff line
@@ -4,12 +4,13 @@ import javax.inject.Inject 


import controllers.auth.AuthenticationModule

import elastic.ElasticClient

import models.{Aliases, CerebroResponse}

import models.{Aliases, CerebroResponse, Hosts}

import play.api.libs.json.JsArray



import scala.concurrent.ExecutionContext.Implicits.global



class AliasesController @Inject()(val authentication: AuthenticationModule,

                                  val hosts: Hosts,

                                  client: ElasticClient) extends BaseController {



  def getAliases = process { request =>

app/controllers/AnalysisController.scala

+2 −1
Original line number Diff line number Diff line
@@ -4,12 +4,13 @@ import javax.inject.Inject 


import controllers.auth.AuthenticationModule

import elastic.ElasticClient

import models.{CerebroResponse, ElasticServer}

import models.{CerebroResponse, ElasticServer, Hosts}

import models.analysis.{IndexAnalyzers, IndexFields, OpenIndices, Tokens}



import scala.concurrent.ExecutionContext.Implicits.global



class AnalysisController @Inject()(val authentication: AuthenticationModule,

                                   val hosts: Hosts,

                                   client: ElasticClient) extends BaseController {



  def getIndices = process { request =>

app/controllers/BaseController.scala

+4 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package controllers 


import controllers.auth.AuthenticationModule

import exceptions.MissingRequiredParamException

import models.{CerebroRequest, CerebroResponse}

import models.{CerebroRequest, CerebroResponse, Hosts}

import play.api.Logger

import play.api.libs.json.Json

import play.api.mvc.{Controller, Result}
@@ -14,13 +14,15 @@ trait BaseController extends Controller with AuthSupport { 


  val authentication: AuthenticationModule



  val hosts: Hosts



  protected val logger = Logger("elastic")



  type RequestProcessor = (CerebroRequest) => Future[Result]



  final def process(processor: RequestProcessor) = AuthAction(authentication).async(parse.json) { request =>

    try {

      processor(CerebroRequest(request))

      processor(CerebroRequest(request, hosts))

    } catch {

      case e: MissingRequiredParamException =>

        Future.successful(CerebroResponse(400, Json.obj("error" -> e.getMessage))) // FIXME: proper error handling

app/controllers/CatController.scala

+2 −1
Original line number Diff line number Diff line
@@ -4,11 +4,12 @@ import javax.inject.Inject 


import controllers.auth.AuthenticationModule

import elastic.ElasticClient

import models.{CerebroResponse, ElasticServer}

import models.{CerebroResponse, Hosts}



import scala.concurrent.ExecutionContext.Implicits.global



class CatController @Inject()(val authentication: AuthenticationModule,

                              val hosts: Hosts,

                              client: ElasticClient) extends BaseController {



  def get = process { request =>

app/controllers/ClusterChangesController.scala

+2 −1
Original line number Diff line number Diff line
@@ -4,14 +4,15 @@ import javax.inject.Inject 


import controllers.auth.AuthenticationModule

import elastic.ElasticClient

import models.{CerebroResponse, ElasticServer}

import models.commons.{Indices, Nodes}

import models.{CerebroResponse, Hosts}

import play.api.libs.json.Json



import scala.concurrent.ExecutionContext.Implicits.global

import scala.concurrent.Future



class ClusterChangesController @Inject()(val authentication: AuthenticationModule,

                                         val hosts: Hosts,

                                         client: ElasticClient) extends BaseController {



  def get = process { request =>