Merge pull request #2 from felipejfc/master

make history index pattern configurable
topfreegames · Oct 24, 2017 · e7faa86 · e7faa86
2 parents 5ad81ad + 872987c
commit e7faa86
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/app/app.go b/app/app.go
@@ -31,6 +31,7 @@ type App struct {
 	Engine      engine.Server
 	RedisClient *redisclient.RedisClient
 	NewRelic    newrelic.Application
+  HistoryIndexPattern string
 }
 
 // GetApp creates an app given the parameters
@@ -97,6 +98,7 @@ func (app *App) configureSentry() {
 
 func (app *App) configureApplication() {
 	app.Engine = standard.New(fmt.Sprintf("%s:%d", app.Host, app.Port))
+  app.HistoryIndexPattern = viper.GetString("elasticsearch.indexPattern")
 	app.API = echo.New()
 	a := app.API
 	_, w, _ := os.Pipe()

diff --git a/app/histories.go b/app/histories.go
@@ -45,7 +45,7 @@ func HistoriesHandler(app *App) func(c echo.Context) error {
 
 			var searchResults *elastic.SearchResult
 			err = WithSegment("elasticsearch", c, func() error {
-				searchResults, err = esclient.Search().Index("chat-*").Query(boolQuery).
+				searchResults, err = esclient.Search().Index(app.HistoryIndexPattern).Query(boolQuery).
 					Sort("timestamp", false).From(from).Size(limit).Do(context.TODO())
 				return err
 			})

diff --git a/app/history.go b/app/history.go
@@ -52,7 +52,7 @@ func HistoryHandler(app *App) func(c echo.Context) error {
 
 			var searchResults *elastic.SearchResult
 			err = WithSegment("elasticsearch", c, func() error {
-				searchResults, err = esclient.Search().Index("chat-*").Query(boolQuery).
+				searchResults, err = esclient.Search().Index(app.HistoryIndexPattern).Query(boolQuery).
 					Sort("timestamp", false).From(from).Size(limit).Do(context.TODO())
 				return err
 			})
@@ -129,7 +129,7 @@ func HistorySinceHandler(app *App) func(c echo.Context) error {
 
 			var searchResults *elastic.SearchResult
 			err = WithSegment("elasticsearch", c, func() error {
-				searchResults, err = esclient.Search().Index("chat-*").Query(boolQuery).
+				searchResults, err = esclient.Search().Index(app.HistoryIndexPattern).Query(boolQuery).
 					Sort("timestamp", false).From(from).Size(limit).Pretty(true).Do(context.TODO())
 				return err
 			})

diff --git a/config/local.yaml b/config/local.yaml
@@ -4,6 +4,7 @@ healthcheck:
 elasticsearch:
   host: "http://localhost:9123"
   sniff: false
+  indexPattern: "chat-*"
   indexMappings:
     chat: '{ "mappings": { "message":{}}}'
 redis:

diff --git a/config/test.yaml b/config/test.yaml
@@ -4,6 +4,7 @@ healthcheck:
 elasticsearch:
   host: "http://localhost:9123"
   sniff: false
+  indexPattern: "chat-*"
   indexMappings:
     chat: '{ "mappings": { "message":{}}}'
 redis: