diff --git a/src/main/java/org/codelibs/fess/app/service/SearchService.java b/src/main/java/org/codelibs/fess/app/service/SearchService.java index 5b54b58c4..338e36df8 100644 --- a/src/main/java/org/codelibs/fess/app/service/SearchService.java +++ b/src/main/java/org/codelibs/fess/app/service/SearchService.java @@ -166,8 +166,8 @@ public class SearchService { // search log if (searchLogSupport) { - ComponentUtil.getSearchLogHelper().addSearchLog(request, DfTypeUtil.toLocalDateTime(requestedTime), queryId, query, pageStart, - pageSize, queryResponseList); + ComponentUtil.getSearchLogHelper().addSearchLog(DfTypeUtil.toLocalDateTime(requestedTime), queryId, query, pageStart, pageSize, + queryResponseList); } } diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java index 4f55d62d4..e2a786103 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java @@ -51,6 +51,7 @@ import org.codelibs.fess.util.StreamUtil; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.script.Script; import org.lastaflute.di.core.SingletonLaContainer; +import org.lastaflute.web.util.LaRequestUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,8 +76,8 @@ public class SearchLogHelper { userInfoCache = new LruHashMap(userInfoCacheSize); } - public void addSearchLog(final HttpServletRequest request, final LocalDateTime requestedTime, final String queryId, final String query, - final int pageStart, final int pageSize, final QueryResponseList queryResponseList) { + public void addSearchLog(final LocalDateTime requestedTime, final String queryId, final String query, final int pageStart, + final int pageSize, final QueryResponseList queryResponseList) { final RoleQueryHelper roleQueryHelper = ComponentUtil.getRoleQueryHelper(); final UserInfoHelper userInfoHelper = ComponentUtil.getUserInfoHelper(); @@ -103,6 +104,7 @@ public class SearchLogHelper { searchLog.setUser(user.getUserId()); }); + final HttpServletRequest request = LaRequestUtil.getRequest(); searchLog.setClientIp(StringUtils.abbreviate(request.getRemoteAddr(), 50)); searchLog.setReferer(StringUtils.abbreviate(request.getHeader("referer"), 1000)); searchLog.setUserAgent(StringUtils.abbreviate(request.getHeader("user-agent"), 255)); diff --git a/src/main/resources/app.xml b/src/main/resources/app.xml index 2ebff6007..d151cb5eb 100644 --- a/src/main/resources/app.xml +++ b/src/main/resources/app.xml @@ -16,6 +16,8 @@ + + diff --git a/src/main/resources/fess.xml b/src/main/resources/fess.xml index b1bf55bb2..a5adc13d8 100644 --- a/src/main/resources/fess.xml +++ b/src/main/resources/fess.xml @@ -8,8 +8,6 @@ - -