From b0a749bdc1ad42bf5901954a61f285285e4f813b Mon Sep 17 00:00:00 2001 From: Steve Waldman Date: Mon, 21 Dec 2015 22:51:12 -0800 Subject: [PATCH] Upgrade c3p0 and tweak default config to avoid Tomcat issues Adds a standard typesafe-config reference.conf file that sets c3p0 config to prevents Tomcat memory leaks on hot-redeploy/shutdown. See http://www.mchange.com/projects/c3p0/#configuring_to_avoid_memory_leaks_on_redeploy http://www.mchange.com/projects/c3p0/#tomcat-specific This new config can be overridden in an application.conf or c3p0.properties file. ( See http://www.mchange.com/projects/c3p0/#configuration_precedence ) Updates c3p0 version to c3p0-0.9.5.2, which fixes that leads to unnecessary String allocation when logging via slf4j. --- project/build.scala | 2 +- src/main/resources/reference.conf | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/reference.conf diff --git a/project/build.scala b/project/build.scala index 5668bebba..9cb1bcfd2 100644 --- a/project/build.scala +++ b/project/build.scala @@ -63,7 +63,7 @@ object MyBuild extends Build { "org.eclipse.jetty" % "jetty-webapp" % "8.1.16.v20140903" % "container;provided", "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts Artifact("javax.servlet", "jar", "jar"), "junit" % "junit" % "4.12" % "test", - "com.mchange" % "c3p0" % "0.9.5", + "com.mchange" % "c3p0" % "0.9.5.2", "com.typesafe" % "config" % "1.2.1", "com.typesafe.akka" %% "akka-actor" % "2.3.10", "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x" exclude("c3p0","c3p0") diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf new file mode 100644 index 000000000..2f8087c4e --- /dev/null +++ b/src/main/resources/reference.conf @@ -0,0 +1,5 @@ +c3p0 { + privilegeSpawnedThreads=true + contextClassLoaderSource=library +} +