inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
7051: Add ability to change log levels at runtime via JMX console - using Log4j's HierarchyDynamicMBean.
   7055: AR-1821. Also related to CHK-1583.
         Manual merge and fix of line endings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-02-08 12:03:57 +00:00
parent 04930c909f
commit 9fe73fc97c
2 changed files with 74 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/alfresco/core-services-context.xml
View File

@@ -83,6 +83,7 @@
<!-- MBeans to register with alfrescoMBeanServer --> <!-- MBeans to register with alfrescoMBeanServer -->
<entry key="Alfresco:Name=VirtServerRegistry,Type=VirtServerRegistry" value-ref="VirtServerRegistry"/> <entry key="Alfresco:Name=VirtServerRegistry,Type=VirtServerRegistry" value-ref="VirtServerRegistry"/>
<entry key="Alfresco:Name=FileServerConfig,Type=FileServerConfig" value-ref="FileServerConfig"/> <entry key="Alfresco:Name=FileServerConfig,Type=FileServerConfig" value-ref="FileServerConfig"/>
<entry key="Alfresco:Name=Log4jHierarchy,Type=Log4JHierarchy" value-ref="log4jHierarchy"/>
</map> </map>
</property> </property>
</bean> </bean>
@@ -119,6 +120,13 @@
<property name="fileServerConfiguration"><ref bean="fileServerConfiguration"/></property> <property name="fileServerConfiguration"><ref bean="fileServerConfiguration"/></property>
</bean> </bean>
<!-- Log4J Hierarchy -->
<bean id="log4jHierarchy" class="org.apache.log4j.jmx.HierarchyDynamicMBean"/>
<bean id="log4JHierarchyInit" class="org.alfresco.repo.admin.Log4JHierarchyInit" init-method="init">
<property name="log4jHierarchy" ref="log4jHierarchy"/>
</bean>
<!-- Datasource bean --> <!-- Datasource bean -->
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="driverClassName"> <property name="driverClassName">

65
source/java/org/alfresco/repo/admin/Log4JHierarchyInit.java Normal file
View File

@@ -0,0 +1,65 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.repo.admin;
import java.util.Enumeration;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.jmx.HierarchyDynamicMBean;
import org.apache.log4j.spi.LoggerRepository;
/**
* Initialises Log4j's HierarchyDynamicMBean (refer to core-services-context.xml)
*
*/
public class Log4JHierarchyInit
{
private HierarchyDynamicMBean log4jHierarchy;
public void setLog4jHierarchy(HierarchyDynamicMBean log4jHierarchy)
{
this.log4jHierarchy = log4jHierarchy;
}
@SuppressWarnings("unchecked")
public void init()
{
// Add each logger (that has a level set) from the Log4J Repository to the Hierarchy MBean
LoggerRepository r = LogManager.getLoggerRepository();
Enumeration loggers = r.getCurrentLoggers();
Logger logger = null;
while (loggers.hasMoreElements())
{
logger = (Logger)loggers.nextElement();
if (logger.getLevel() != null)
{
log4jHierarchy.addLoggerMBean(logger.getName());
}
}
}
}