Skip to content
Snippets Groups Projects
Commit 42777153 authored by cmaeder's avatar cmaeder
Browse files

make search and routes work for sally and jetty

parent c4538bd0
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,7 @@ class BundleStarter { ...@@ -34,7 +34,7 @@ class BundleStarter {
.initTemplating("/home/maeder/mmt-errorview/src/main/resource/static/") .initTemplating("/home/maeder/mmt-errorview/src/main/resource/static/")
.setDebugTemplating(true) .setDebugTemplating(true)
*/ */
context.addRoutes(new SearchDB("servlet:///error/")) context.addRoutes(new SearchDB("servlet:///error/", false))
context.start() context.start()
} }
......
...@@ -9,7 +9,7 @@ import org.apache.camel.scala.dsl.builder.RouteBuilder ...@@ -9,7 +9,7 @@ import org.apache.camel.scala.dsl.builder.RouteBuilder
import org.apache.camel.util.jndi.JndiContext import org.apache.camel.util.jndi.JndiContext
import org.eclipse.jetty.server.handler.ResourceHandler import org.eclipse.jetty.server.handler.ResourceHandler
class SearchDB(prefix: String) extends RouteBuilder { class SearchDB(inPrefix: String, addStaticRoute: Boolean) extends RouteBuilder {
def query2HashMap(ex: Exchange): util.HashMap[String, String] = { def query2HashMap(ex: Exchange): util.HashMap[String, String] = {
val hm = new util.HashMap[String, String]() val hm = new util.HashMap[String, String]()
...@@ -18,6 +18,13 @@ class SearchDB(prefix: String) extends RouteBuilder { ...@@ -18,6 +18,13 @@ class SearchDB(prefix: String) extends RouteBuilder {
hm hm
} }
var prefix = inPrefix
if (addStaticRoute) {
(prefix +
"static?matchOnUriPrefix=true&handlers=#staticHandler") -->
("log:lll" + this.getClass + "?showHeaders=true")
prefix = inPrefix + "sally/error/"
}
Table.columns.map { col => Table.columns.map { col =>
((prefix + "count/" + col) transform ((prefix + "count/" + col) transform
(ex => "%" + ex.getIn.getHeader("text") + "%")) --> (ex => "%" + ex.getIn.getHeader("text") + "%")) -->
...@@ -27,7 +34,6 @@ class SearchDB(prefix: String) extends RouteBuilder { ...@@ -27,7 +34,6 @@ class SearchDB(prefix: String) extends RouteBuilder {
("db:SELECT * FROM errors WHERE " + col + " LIKE :#text LIMIT :#limit") marshal ("db:SELECT * FROM errors WHERE " + col + " LIKE :#text LIMIT :#limit") marshal
new DataFormatDefinition(new JacksonDataFormat()) new DataFormatDefinition(new JacksonDataFormat())
} }
// prefix + "static?matchOnUriPrefix=true&handlers=#staticHandler" --> "log:a"
} }
object SearchDB { object SearchDB {
...@@ -39,7 +45,7 @@ object SearchDB { ...@@ -39,7 +45,7 @@ object SearchDB {
val jdni = new JndiContext() val jdni = new JndiContext()
jdni.bind("staticHandler", resHandler) jdni.bind("staticHandler", resHandler)
context.setJndiContext(jdni) context.setJndiContext(jdni)
context.addRoutes(new SearchDB("jetty:http://localhost:8383/")) context.addRoutes(new SearchDB("jetty:http://localhost:8383/", true))
context.start() context.start()
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment