diff --git a/src/main/scala/gitbucket/core/service/WebHookService.scala b/src/main/scala/gitbucket/core/service/WebHookService.scala index 346c8cc..d8ca928 100644 --- a/src/main/scala/gitbucket/core/service/WebHookService.scala +++ b/src/main/scala/gitbucket/core/service/WebHookService.scala @@ -18,6 +18,7 @@ import org.eclipse.jgit.lib.ObjectId import org.slf4j.LoggerFactory import scala.concurrent._ +import scala.util.{Success, Failure} import org.apache.http.HttpRequest import org.apache.http.HttpResponse import gitbucket.core.model.WebHookContentType @@ -130,7 +131,7 @@ httpPost.releaseConnection() logger.debug(s"end web hook invocation for ${webHook}") res - }catch{ + } catch { case e:Throwable => { if(!reqPromise.isCompleted){ reqPromise.failure(e) @@ -139,11 +140,9 @@ } } } - f.onSuccess { - case s => logger.debug(s"Success: web hook request to ${webHook.url}") - } - f.onFailure { - case t => logger.error(s"Failed: web hook request to ${webHook.url}", t) + f.onComplete { + case Success(_) => logger.debug(s"Success: web hook request to ${webHook.url}") + case Failure(t) => logger.error(s"Failed: web hook request to ${webHook.url}", t) } (webHook, json, reqPromise.future, f) } diff --git a/src/main/scala/gitbucket/core/util/DatabaseConfig.scala b/src/main/scala/gitbucket/core/util/DatabaseConfig.scala index 681cebc..644c3f2 100644 --- a/src/main/scala/gitbucket/core/util/DatabaseConfig.scala +++ b/src/main/scala/gitbucket/core/util/DatabaseConfig.scala @@ -91,7 +91,7 @@ val liquiDriver = new PostgresDatabase() } - object BlockingPostgresDriver extends slick.driver.PostgresDriver with BlockingJdbcProfile { + object BlockingPostgresDriver extends slick.jdbc.PostgresProfile with BlockingJdbcProfile { override def quoteIdentifier(id: String): String = { val s = new StringBuilder(id.length + 4) append '"' for(c <- id) if(c == '"') s append "\"\"" else s append c.toLower diff --git a/src/main/scala/gitbucket/core/util/Notifier.scala b/src/main/scala/gitbucket/core/util/Notifier.scala index 41d5b6b..3980029 100644 --- a/src/main/scala/gitbucket/core/util/Notifier.scala +++ b/src/main/scala/gitbucket/core/util/Notifier.scala @@ -7,6 +7,7 @@ import gitbucket.core.view.Markdown import scala.concurrent._ +import scala.util.{Success, Failure} import ExecutionContext.Implicits.global import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail} import org.slf4j.LoggerFactory @@ -93,11 +94,9 @@ } "Notifications Successful." } - f onSuccess { - case s => logger.debug(s) - } - f onFailure { - case t => logger.error("Notifications Failed.", t) + f.onComplete { + case Success(s) => logger.debug(s) + case Failure(t) => logger.error("Notifications Failed.", t) } }