You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2014/06/27 11:56:14 UTC
svn commit: r1606004 - /subversion/trunk/subversion/mod_dav_svn/version.c
Author: philip
Date: Fri Jun 27 09:56:14 2014
New Revision: 1606004
URL: http://svn.apache.org/r1606004
Log:
Log post-commit errors in the Apache error log as well as returning
them to the client.
* subversion/mod_dav_svn/version.c
(dav_svn__checkin): Log APR_EGENERAL rather than serr->apr_err to
avoid httpd giving "APR does not understand this error".
(merge): Log any post-commit error.
Modified:
subversion/trunk/subversion/mod_dav_svn/version.c
Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1606004&r1=1606003&r2=1606004&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Fri Jun 27 09:56:14 2014
@@ -972,7 +972,7 @@ dav_svn__checkin(dav_resource *resource,
{
const char *post_commit_err = svn_repos__post_commit_error_str
(serr, resource->pool);
- ap_log_perror(APLOG_MARK, APLOG_ERR, serr->apr_err,
+ ap_log_perror(APLOG_MARK, APLOG_ERR, APR_EGENERAL,
resource->pool,
"commit of r%ld succeeded, but an error occurred "
"after the commit: '%s'",
@@ -1497,6 +1497,11 @@ merge(dav_resource *target,
### client some other way than hijacking the post-commit
### error message.*/
post_commit_err = svn_repos__post_commit_error_str(serr, pool);
+ ap_log_perror(APLOG_MARK, APLOG_ERR, APR_EGENERAL, pool,
+ "commit of r%ld succeeded, but an error occurred "
+ "after the commit: '%s'",
+ new_rev,
+ post_commit_err);
svn_error_clear(serr);
serr = SVN_NO_ERROR;
}