EVDOC01-142 Usem fitxer log4j2.properties per a configuració

Author: mateullas

kernel/kernel-impl/src/main/java/org/sakaiproject/ignite/IgniteConfigurationAdapter.java

@@ -119,7 +119,7 @@ protected IgniteConfiguration createInstance() {
             igniteConfiguration.setDeploymentMode(DeploymentMode.CONTINUOUS);
 
             try {
-                igniteConfiguration.setGridLogger(new Log4J2Logger(serverConfigurationService.getSakaiHomePath() + "custom-ignite-log4j2.xml"));
+                igniteConfiguration.setGridLogger(new Log4J2Logger(System.getProperty("catalina.home") + "/conf/log4j2.properties"));
             } catch (Exception e) {
                 log.error("Error trying to set log4j configuration " + e.getMessage());
             }

microsoft-integration/impl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftCommonServiceImpl.java

@@ -168,7 +168,7 @@ public class MicrosoftCommonServiceImpl implements MicrosoftCommonService {
 
 	public void init() {
 		LoggerContext context = (LoggerContext) LogManager.getContext(false);
-		context.setConfigLocation(new File(serverConfigurationService.getSakaiHomePath() + "custom-microsoft-log4j2.xml").toURI());
+		context.setConfigLocation(new File(System.getProperty("catalina.home") + "/conf/log4j2.properties").toURI());
 		context.reconfigure();
 
 		// register functions