Merge with master
This commit is contained in:
commit
3cf2dc075d
1 changed files with 5 additions and 0 deletions
|
|
@ -50,6 +50,11 @@ class AkkaServlet extends AtmosphereServlet with Logging {
|
|||
addInitParameter(AtmosphereServlet.PROPERTY_USE_STREAM,"true")
|
||||
addInitParameter("com.sun.jersey.config.property.packages",c.getList("akka.rest.resource_packages").mkString(";"))
|
||||
addInitParameter("com.sun.jersey.spi.container.ResourceFilters",c.getList("akka.rest.filters").mkString(","))
|
||||
c.getInt("akka.rest.maxInactiveActivity").foreach { value =>
|
||||
log.info("MAX_INACTIVE:%s",value.toString)
|
||||
addInitParameter(CometSupport.MAX_INACTIVE,value.toString)
|
||||
}
|
||||
|
||||
|
||||
val servlet = new AtmosphereRestServlet {
|
||||
override def getInitParameter(key : String) = AkkaServlet.this.getInitParameter(key)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue