Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #121)Create WebHookPayload only when web hook has been registered.

Browse Source
This commit is contained in:
takezoe
2013-10-06 23:22:29 +09:00
parent b92b429ffa
commit e94411ebeb
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/scala/app/RepositorySettingsController.scala
View File

@@ -137,13 +137,16 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
.setMaxCount(3) .setMaxCount(3)
.call.iterator.asScala.map(new CommitInfo(_)) .call.iterator.asScala.map(new CommitInfo(_))
callWebHook(repository.owner, repository.name, val webHookURLs = getWebHookURLs(repository.owner, repository.name)
WebHookPayload( if(webHookURLs.nonEmpty){
git, callWebHook(repository.owner, repository.name, webHookURLs,
"refs/heads/" + repository.repository.defaultBranch, WebHookPayload(
repository, git,
commits.toList, "refs/heads/" + repository.repository.defaultBranch,
getAccountByUserName(repository.owner).get)) repository,
commits.toList,
getAccountByUserName(repository.owner).get))
}
flash += "info" -> "Test payload deployed!" flash += "info" -> "Test payload deployed!"
} }

4
src/main/scala/service/WebHookService.scala
View File

@@ -29,7 +29,7 @@ trait WebHookService {
def deleteWebHookURL(owner: String, repository: String, url :String): Unit = def deleteWebHookURL(owner: String, repository: String, url :String): Unit =
Query(WebHooks).filter(_.byPrimaryKey(owner, repository, url)).delete Query(WebHooks).filter(_.byPrimaryKey(owner, repository, url)).delete
def callWebHook(owner: String, repository: String, payload: WebHookPayload): Unit = { def callWebHook(owner: String, repository: String, webHookURLs: List[WebHook], payload: WebHookPayload): Unit = {
import org.json4s._ import org.json4s._
import org.json4s.jackson.Serialization import org.json4s.jackson.Serialization
import org.json4s.jackson.Serialization.{read, write} import org.json4s.jackson.Serialization.{read, write}
@@ -41,8 +41,6 @@ trait WebHookService {
logger.debug("start callWebHook") logger.debug("start callWebHook")
implicit val formats = Serialization.formats(NoTypeHints) implicit val formats = Serialization.formats(NoTypeHints)
val webHookURLs = getWebHookURLs(owner, repository)
if(webHookURLs.nonEmpty){ if(webHookURLs.nonEmpty){
val json = write(payload) val json = write(payload)
val httpClient = new DefaultHttpClient() val httpClient = new DefaultHttpClient()

17
src/main/scala/servlet/GitRepositoryServlet.scala
View File

@@ -129,14 +129,17 @@ class CommitLogHook(owner: String, repository: String, userName: String, baseURL
} }
// call web hook // call web hook
val payload = WebHookPayload( val webHookURLs = getWebHookURLs(owner, repository)
git, if(webHookURLs.nonEmpty){
command.getRefName, val payload = WebHookPayload(
getRepository(owner, repository, baseURL).get, git,
newCommits, command.getRefName,
getAccountByUserName(owner).get) getRepository(owner, repository, baseURL).get,
newCommits,
getAccountByUserName(owner).get)
callWebHook(owner, repository, payload) callWebHook(owner, repository, webHookURLs, payload)
}
} }
} }
// update repository last modified time. // update repository last modified time.