Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 23:15:43 +01:00
Code Issues Packages Projects Releases Activity

improve logging of mercurial hook callback

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-08-23 15:43:15 +02:00
parent fa03332fe6
commit 48b37d688c
1 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java
View File

@@ -47,6 +47,7 @@ import sonia.scm.repository.HgRepositoryHookEvent;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryNotFoundException;
import sonia.scm.util.HttpUtil;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
@@ -104,6 +105,59 @@ public class HgHookCallbackServlet extends HttpServlet
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @param request
* @param response
*
* @throws IOException
* @throws ServletException
*/
@Override
protected void doPost(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException
{
String strippedURI = HttpUtil.getStrippedURI(request);
Matcher m = REGEX_URL.matcher(strippedURI);
if (m.matches())
{
String repositoryId = m.group(1);
String type = m.group(2);
String challenge = request.getParameter(PARAM_CHALLENGE);
if (Util.isNotEmpty(challenge))
{
String node = request.getParameter(PARAM_NODE);
if (Util.isNotEmpty(node))
{
hookCallback(response, repositoryId, type, challenge, node);
}
else if (logger.isDebugEnabled())
{
logger.debug("node parameter not found");
}
}
else if (logger.isDebugEnabled())
{
logger.debug("challenge parameter not found");
}
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("url does not match");
}
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
}
}
/**
* Method description
*
@@ -116,8 +170,9 @@ public class HgHookCallbackServlet extends HttpServlet
*
* @throws IOException
*/
public void hookCallback(HttpServletResponse response, String repositoryName,
String type, String challenge, String node)
private void hookCallback(HttpServletResponse response,
String repositoryName, String type,
String challenge, String node)
throws IOException
{
if (hookManager.isAcceptAble(challenge))
@@ -155,39 +210,6 @@ public class HgHookCallbackServlet extends HttpServlet
}
}
/**
* Method description
*
*
* @param request
* @param response
*
* @throws IOException
* @throws ServletException
*/
@Override
protected void doPost(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException
{
String strippedURI = HttpUtil.getStrippedURI(request);
Matcher m = REGEX_URL.matcher(strippedURI);
if (m.matches())
{
String repositoryId = m.group(1);
String type = m.group(2);
String challenge = request.getParameter(PARAM_CHALLENGE);
String node = request.getParameter(PARAM_NODE);
hookCallback(response, repositoryId, type, challenge, node);
}
else
{
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
}
}
//~--- fields ---------------------------------------------------------------
/** Field description */