diff --git a/src/java/fr/paris/lutece/portal/resources/system_messages.properties b/src/java/fr/paris/lutece/portal/resources/system_messages.properties index 9c146644e..659a0a532 100644 --- a/src/java/fr/paris/lutece/portal/resources/system_messages.properties +++ b/src/java/fr/paris/lutece/portal/resources/system_messages.properties @@ -68,6 +68,7 @@ manage_caches.actionDisable=Turn off manage_caches.actionViewKeys=View config and keys manage_caches.buttonFlush=Flush all manage_caches.buttonViewKeys=View config and keys +manage_caches.titleReloadLogsConfiguration=Log configuration loading manage_caches.titleReloadProperties=Properties loading manage_caches.labelReloadProperties=Reload properties files manage_caches.buttonReload=Reload diff --git a/src/java/fr/paris/lutece/portal/resources/system_messages_fr.properties b/src/java/fr/paris/lutece/portal/resources/system_messages_fr.properties index ffc982fcd..bc4a0c503 100644 --- a/src/java/fr/paris/lutece/portal/resources/system_messages_fr.properties +++ b/src/java/fr/paris/lutece/portal/resources/system_messages_fr.properties @@ -68,6 +68,7 @@ manage_caches.actionDisable=D\u00e9sactiver manage_caches.actionViewKeys=Visualiser les cl\u00e9s manage_caches.buttonFlush=Vider tous les caches manage_caches.buttonViewKeys=Visualiser les cl\u00e9s +manage_caches.titleReloadLogsConfiguration=Rechargement de la configuration des logs manage_caches.titleReloadProperties=Rechargement des properties manage_caches.labelReloadProperties=Recharger les fichiers properties manage_caches.buttonReload=Recharger diff --git a/src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java b/src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java index 870634337..94ded0ea0 100644 --- a/src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/system/CacheJspBean.java @@ -39,6 +39,7 @@ import fr.paris.lutece.portal.service.i18n.I18nService; import fr.paris.lutece.portal.service.security.SecurityTokenService; import fr.paris.lutece.portal.service.template.AppTemplateService; +import fr.paris.lutece.portal.service.util.AppLogService; import fr.paris.lutece.portal.service.util.AppPropertiesService; import fr.paris.lutece.portal.web.admin.AdminFeaturesPageJspBean; import fr.paris.lutece.util.html.HtmlTemplate; @@ -70,6 +71,10 @@ public class CacheJspBean extends AdminFeaturesPageJspBean private static final String TEMPLATE_CACHE_INFOS = "admin/system/cache_infos.html"; private static final String PARAMETER_ID_CACHE = "id_cache"; + // Conf + private static final String PATH_CONF = "/WEB-INF/conf/"; + private static final String FILE_PROPERTIES_CONFIG = "config.properties"; + /** * Returns the page to manage caches * @@ -138,6 +143,24 @@ public String doReloadProperties( HttpServletRequest request ) throws AccessDeni return JSP_MANAGE_CACHES; } + /** + * Reload the logs configuration of the application + * + * @return The URL to display when the process is done. + * @throws AccessDeniedException + */ + public String doReloadLogsConfiguration( HttpServletRequest request ) throws AccessDeniedException + { + if ( !SecurityTokenService.getInstance( ).validate( request, TEMPLATE_MANAGE_CACHES ) ) + { + throw new AccessDeniedException( "Invalid security token" ); + } + AppLogService.init( PATH_CONF, FILE_PROPERTIES_CONFIG ); + + return JSP_MANAGE_CACHES; + } + + /** * Gets cache infos for all caches * diff --git a/webapp/WEB-INF/templates/admin/system/manage_caches.html b/webapp/WEB-INF/templates/admin/system/manage_caches.html index 5daac2443..66b38ffad 100644 --- a/webapp/WEB-INF/templates/admin/system/manage_caches.html +++ b/webapp/WEB-INF/templates/admin/system/manage_caches.html @@ -7,6 +7,10 @@ <@button type='submit' buttonIcon='refresh' title='#i18n{portal.system.manage_caches.titleReloadProperties}' id='reload' size='' showTitleXs=false showTitleSm=false /> <@aButton href='jsp/admin/system/CacheInfos.jsp' buttonIcon='key' title='#i18n{portal.system.manage_caches.buttonViewKeys}' size='' showTitleXs=false showTitleSm=false /> + <@tform method='post' action='jsp/admin/system/DoReloadLogsConfiguration.jsp' class='pull-right spaced'> + + <@button type='submit' buttonIcon='refresh' title='#i18n{portal.system.manage_caches.titleReloadLogsConfiguration}' id='reloadLogsConf' size='' showTitleXs=false showTitleSm=false /> + <@tform method='post' action='jsp/admin/system/DoResetCaches.jsp' class='pull-right spaced'> <@button type='submit' buttonIcon='trash' title='#i18n{portal.system.manage_caches.buttonFlush}' size='' color='btn-danger' showTitleXs=false showTitleSm=false /> diff --git a/webapp/jsp/admin/system/DoReloadLogsConfiguration.jsp b/webapp/jsp/admin/system/DoReloadLogsConfiguration.jsp new file mode 100644 index 000000000..c3c8ad575 --- /dev/null +++ b/webapp/jsp/admin/system/DoReloadLogsConfiguration.jsp @@ -0,0 +1,8 @@ +<%@ page errorPage="../ErrorPage.jsp" %> + + + +<% + cache.init( request , cache.RIGHT_CACHE_MANAGEMENT ); + response.sendRedirect( cache.doReloadLogsConfiguration( request ) ); +%>