#Fix: Log4Java broken after refactoring (#42)

ggallotti · web-flow · commit 6539d40bb336 · 2019-06-03T10:34:27.000-03:00
* #Fix: Log4Java broken after refactoring
- LogManager delay initialization

* WebAppStartup base directory

* Issue 74643
If the first object that was called after the webapp was started was GXOAuthAccessToken a nullpointer excpetion was throwed when the logger was initialized

* In the last commit there was an error in the place that logger was created.

* Improved Log Initial configuration

* Revert Issue 74643

* Fix android build LogManager.

* #Fix: Logger initialization fixes. REST, WS Native.

* #Fix: WSHandlerChain log4j error
diff --git a/android/src/main/java/com/genexus/specific/android/LogManager.java b/android/src/main/java/com/genexus/specific/android/LogManager.java
@@ -5,11 +5,6 @@
 
 public class LogManager implements IExtensionLogManager {
 
-	@Override
-	public boolean initialize(String logBasePath) {
-		return true;
-	}
-
 	@Override
 	public ILogger getLogger(Class<?> clazz) {
 		return new com.genexus.diagnostics.core.provider.AndroidLogger();
diff --git a/common/src/main/java/com/genexus/common/interfaces/IExtensionLogManager.java b/common/src/main/java/com/genexus/common/interfaces/IExtensionLogManager.java
@@ -4,8 +4,6 @@
 
 public interface IExtensionLogManager {
 
-	boolean initialize(String logBasePath);
-
 	ILogger getLogger(Class<?> clazz);
 
 	ILogger getLogger(String className);
diff --git a/common/src/main/java/com/genexus/diagnostics/core/LogManager.java b/common/src/main/java/com/genexus/diagnostics/core/LogManager.java
@@ -4,19 +4,6 @@
 
 public class LogManager {
 
-	private static boolean _initialized = false;
-
-	public static boolean initialize(String logBasePath) {
-		if (!_initialized)
-		{
-			if (SpecificImplementation.LogManager != null)
-				_initialized = SpecificImplementation.LogManager.initialize(logBasePath);
-			else
-				_initialized = true;
-		}
-		return _initialized;
-	}
-
 	public static ILogger getLogger(final Class<?> clazz) {
 		return SpecificImplementation.LogManager.getLogger(clazz);
 	}
diff --git a/java/src/main/java/com/genexus/Application.java b/java/src/main/java/com/genexus/Application.java
@@ -6,7 +6,6 @@
 import java.util.Properties;
 import java.util.Vector;
 
-import com.genexus.common.interfaces.IPreferences;
 import com.genexus.db.DBConnectionManager;
 import com.genexus.db.DynamicExecute;
 import com.genexus.db.Namespace;
@@ -21,13 +20,14 @@
 import com.genexus.util.ReorgSubmitThreadPool;
 import com.genexus.util.SubmitThreadPool;
 
+
 public class Application
 {
 	static {
 		Connect.init();
-		com.genexus.diagnostics.core.LogManager.initialize(".");
 	}
-	public static final ILogger logger = LogManager.getLogger(Application.class);
+
+	public static ILogger logger = LogManager.getLogger(Application.class);
 
 	public static boolean usingQueue = false;
 	private static final boolean DEBUG = DebugFlag.DEBUG;
@@ -46,7 +46,8 @@ public class Application
 	static Class ClassName = null;
 
 	private static volatile ExternalProvider externalProvider = null;
-
+	private static Object objectLock = new Object();
+	private static volatile boolean initialized = false;
 
 	public static void onExitCleanup()
 	{
@@ -121,10 +122,6 @@ public static void init(Class gxCfg)
 		init(gxCfg, true);
 	}
 
-	private static Object objectLock = new Object();
-
-	private static volatile boolean initialized = false;
-
 	public static void init(Class gxCfg, boolean doLogin)
 	{
 		if	(!initialized)
diff --git a/java/src/main/java/com/genexus/GxRestService.java b/java/src/main/java/com/genexus/GxRestService.java
@@ -22,7 +22,7 @@
 
 abstract public class GxRestService extends GXWebObjectBase 
 {
-	private static final ILogger logger = LogManager.getLogger(GxRestService.class);
+	private static ILogger logger = null;
 	
 	protected JSONObject errorJson;
 	protected boolean error = false;
@@ -59,6 +59,7 @@ public GxRestService()
 	HttpContext restHttpContext;
 	public void init(String requestMethod, HttpServletRequest myServletRequest, HttpServletResponse myServletResponse, ServletContext myContext)
 	{
+		initLogger(myContext);
 		try
 		{
 			String gxcfg = myContext.getInitParameter("gxcfg");
@@ -83,8 +84,14 @@ public void init(String requestMethod, HttpServletRequest myServletRequest, Http
 			logger.error("Could not initialize Rest Service", e);
 		}
 	}
-	
-   public void webExecute( )
+
+	private void initLogger(ServletContext myContext) {
+		if (logger == null) {
+			logger = com.genexus.specific.java.LogManager.initialize(myContext.getRealPath("/"), GxRestService.class);
+		}
+	}
+
+	public void webExecute( )
    {
    }
 
diff --git a/java/src/main/java/com/genexus/specific/java/LogManager.java b/java/src/main/java/com/genexus/specific/java/LogManager.java
@@ -1,16 +1,34 @@
 package com.genexus.specific.java;
 
 import com.genexus.common.interfaces.IExtensionLogManager;
+import com.genexus.common.interfaces.SpecificImplementation;
 import com.genexus.diagnostics.core.ILogger;
 
 public class LogManager implements IExtensionLogManager {
+	private static boolean initialized;
 
-	@Override
-	public boolean initialize(String logBasePath) {
-		org.apache.logging.log4j.core.lookup.MapLookup.setMainArguments(new String[] {logBasePath});
+	static {
+		configure(".");
+	}
+
+	public static void configure(String logBasePath) {
+		org.apache.logging.log4j.core.lookup.MapLookup.setMainArguments(new String[]{logBasePath});
 		//If we do not disable StatusLogger => Log4J throws message logging when log4j.xml is not found
 		org.apache.logging.log4j.status.StatusLogger.getLogger().setLevel(org.apache.logging.log4j.Level.OFF);
-		return true;
+	}
+	public static void initialize(String logBasePath) {
+		if (!initialized) {
+			initialized = true;
+			configure(logBasePath);
+			if (SpecificImplementation.LogManager == null) {
+				SpecificImplementation.LogManager = new LogManager();
+			}
+		}
+	}
+
+	public static ILogger initialize(String logBasePath, Class<?> clazz) {
+		initialize(logBasePath);
+		return SpecificImplementation.LogManager.getLogger(clazz);
 	}
 
 	@Override
diff --git a/java/src/main/java/com/genexus/webpanels/GXObjectUploadServices.java b/java/src/main/java/com/genexus/webpanels/GXObjectUploadServices.java
@@ -18,7 +18,7 @@ public class GXObjectUploadServices extends GXWebObjectStub
 {   
     protected void doExecute(HttpContext context) throws Exception
     {
-        new WebApplicationStartup().init(Application.gxCfg, context);
+        WebApplicationStartup.init(Application.gxCfg, context);
         context.setStream();
         
 		try
diff --git a/java/src/main/java/com/genexus/webpanels/GXWebObjectStub.java b/java/src/main/java/com/genexus/webpanels/GXWebObjectStub.java
@@ -16,10 +16,9 @@
 import com.genexus.security.GXResult;
 import com.genexus.security.GXSecurityProvider;
 
-
 public abstract class GXWebObjectStub extends HttpServlet
 {
-	public static final ILogger logger = LogManager.getLogger(GXWebObjectStub.class);
+	public static ILogger logger = null;
 
 	private static final boolean DEBUG       = DebugFlag.DEBUG;
 
@@ -103,8 +102,8 @@ private void dumpRequestInfo(HttpContext httpContext)
 
 	private void callExecute(String method, HttpServletRequest req, HttpServletResponse res) throws ServletException
 	{
+		initialize(req, res);
 		HttpContext httpContext = null;
-		setResponseBufferSize(res);
 		try
 		{
 			String gxcfg = getServletContext().getInitParameter("gxcfg");
@@ -217,6 +216,13 @@ else if (IntegratedSecurityLevel() == SECURITY_LOW)
 		}
 	}
 
+	private void initialize(HttpServletRequest req, HttpServletResponse res) {
+		if (logger == null) {
+			logger = com.genexus.specific.java.LogManager.initialize(req.getServletContext().getRealPath("/"), GXWebObjectStub.class);
+		}
+		setResponseBufferSize(res);
+	}
+
 	private void setResponseBufferSize(HttpServletResponse res) {
 		Integer bSize = 0;
 		try {
diff --git a/java/src/main/java/com/genexus/webpanels/ServletEventListener.java b/java/src/main/java/com/genexus/webpanels/ServletEventListener.java
@@ -12,6 +12,7 @@
 import com.genexus.db.DBConnectionManager;
 import com.genexus.db.Namespace;
 import com.genexus.platform.NativeFunctions;
+import com.genexus.specific.java.LogManager;
 import com.genexus.util.GXServices;
 import com.genexus.util.PropertiesManager;
 import com.genexus.util.SubmitThreadPool;
@@ -79,6 +80,8 @@ public void contextDestroyed(ServletContextEvent event)
 	public void contextInitialized(ServletContextEvent event)
 	{
 		ServletContext context = event.getServletContext();
+		String basePath = context.getRealPath("/");
+		LogManager.initialize(basePath);
 		String gxcfg = context.getInitParameter("gxcfg");
 		if (gxcfg != null)
 		{
@@ -87,8 +90,6 @@ public void contextInitialized(ServletContextEvent event)
 				Class gxcfgClass = Class.forName(gxcfg);
 				ApplicationContext appContext = ApplicationContext.getInstance();
 				appContext.setServletEngine(true);
-				String basePath = context.getRealPath("/");
-				com.genexus.diagnostics.core.LogManager.initialize(basePath);
 				appContext.setServletEngineDefaultPath(basePath);
 				Application.init(gxcfgClass);
 			}
diff --git a/java/src/main/java/com/genexus/webpanels/WebApplicationStartup.java b/java/src/main/java/com/genexus/webpanels/WebApplicationStartup.java
@@ -4,12 +4,13 @@
 import com.genexus.ApplicationContext;
 import com.genexus.ModelContext;
 import com.genexus.internet.HttpContext;
+import com.genexus.specific.java.LogManager;
 
-public class WebApplicationStartup 
+public class WebApplicationStartup
 {
-	static boolean initialized = false;
+	private static boolean initialized = false;
 
-	public void init(Class baseClass, HttpContext httpContext)
+	public static void init(Class baseClass, HttpContext httpContext)
 	{
 		if (!initialized)
 		{
@@ -18,16 +19,17 @@ public void init(Class baseClass, HttpContext httpContext)
 	}
 	
 	
-	private synchronized void initImpl(Class baseClass, HttpContext httpContext)
+	private static synchronized void initImpl(Class baseClass, HttpContext httpContext)
 	{
 		if	(!initialized)
-		{				
+		{
+			String basePath = httpContext.getDefaultPath();
 			ApplicationContext appContext = ApplicationContext.getInstance();
 
 			appContext.setMsgsToUI(false);
 			appContext.setServletEngine(true);
-			appContext.setServletEngineDefaultPath(httpContext.getDefaultPath());
-
+			appContext.setServletEngineDefaultPath(basePath);
+			LogManager.initialize(basePath);
       		Application.init(baseClass, false);
 			ModelContext.getModelContext(baseClass).setHttpContext(httpContext);
 			initialized = true;
diff --git a/java/src/main/java/com/genexus/ws/GXHandlerChain.java b/java/src/main/java/com/genexus/ws/GXHandlerChain.java
@@ -6,52 +6,52 @@
 import javax.xml.ws.handler.soap.SOAPHandler;
 import javax.xml.ws.handler.MessageContext;
 import javax.xml.ws.handler.soap.SOAPMessageContext;
+import javax.xml.ws.WebServiceContext;
+import javax.annotation.Resource;
+import javax.servlet.ServletContext;
+
 import com.genexus.diagnostics.core.ILogger;
-import com.genexus.diagnostics.core.LogManager;
-
-public class GXHandlerChain implements SOAPHandler<SOAPMessageContext>
-{
-	private static ILogger logger = null;
-	public static final String GX_SOAP_BODY = "GXSoapBody";
-	
-  public Set<QName> getHeaders()
-  {
-    return Collections.emptySet();
-  }
-  
-  public boolean handleMessage(SOAPMessageContext messageContext)
-  {
-  	if (logger == null) {
-		logger = LogManager.getLogger(GXHandlerChain.class);
-	}
-
-			Boolean outboundProperty = (Boolean) messageContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-  		java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();;
-  		try
-  		{
-  			messageContext.getMessage().writeTo(out);
-  			String messageBody = new String(out.toByteArray(), "utf-8"); 
-				if (Boolean.FALSE.equals(outboundProperty)) 
-				{  				
-  				messageContext.put(GX_SOAP_BODY, messageBody);
-  				messageContext.setScope(GX_SOAP_BODY, MessageContext.Scope.APPLICATION);
-  			}
-  			
-				logger.debug(messageBody);
-  		}
-			catch (Exception e) 
-			{
-					logger.error("Exception in handler: ", e);
-			}				
-      return true;
-  }
-  
-  public boolean handleFault(SOAPMessageContext messageContext)
-  {
-    return true;
-  }
-  
-  public void close(MessageContext messageContext)
-  {
-  }
+import com.genexus.specific.java.LogManager;
+
+
+public class GXHandlerChain implements SOAPHandler<SOAPMessageContext> {
+    private static ILogger logger = null;
+    public static final String GX_SOAP_BODY = "GXSoapBody";
+
+    public Set<QName> getHeaders() {
+        return Collections.emptySet();
+    }
+
+    public boolean handleMessage(SOAPMessageContext messageContext) {
+        initialize(messageContext);
+        Boolean outboundProperty = (Boolean) messageContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
+        java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
+        ;
+        try {
+            messageContext.getMessage().writeTo(out);
+            String messageBody = new String(out.toByteArray(), "utf-8");
+            if (Boolean.FALSE.equals(outboundProperty)) {
+                messageContext.put(GX_SOAP_BODY, messageBody);
+                messageContext.setScope(GX_SOAP_BODY, MessageContext.Scope.APPLICATION);
+            }
+            logger.debug(messageBody);
+        } catch (Exception e) {
+            logger.error("Exception in handler: ", e);
+        }
+        return true;
+    }
+
+    private void initialize(SOAPMessageContext messageContext) {
+        if (logger == null) {
+            ServletContext servletContext = (ServletContext) messageContext.get(MessageContext.SERVLET_CONTEXT);
+            logger = LogManager.initialize(servletContext.getRealPath("/"), GXHandlerChain.class);
+        }
+    }
+
+    public boolean handleFault(SOAPMessageContext messageContext) {
+        return true;
+    }
+
+    public void close(MessageContext messageContext) {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`abstract public class GxRestService extends GXWebObjectBase`
`24`	`24`	`{`
`25`		`- private static final ILogger logger = LogManager.getLogger(GxRestService.class);`
	`25`	`+ private static ILogger logger = null;`
`26`	`26`
`27`	`27`	`protected JSONObject errorJson;`
`28`	`28`	`protected boolean error = false;`
`@@ -59,6 +59,7 @@ public GxRestService()`
`59`	`59`	`HttpContext restHttpContext;`
`60`	`60`	`public void init(String requestMethod, HttpServletRequest myServletRequest, HttpServletResponse myServletResponse, ServletContext myContext)`
`61`	`61`	`{`
	`62`	`+ initLogger(myContext);`
`62`	`63`	`try`
`63`	`64`	`{`
`64`	`65`	`String gxcfg = myContext.getInitParameter("gxcfg");`
`@@ -83,8 +84,14 @@ public void init(String requestMethod, HttpServletRequest myServletRequest, Http`
`83`	`84`	`logger.error("Could not initialize Rest Service", e);`
`84`	`85`	`}`
`85`	`86`	`}`
`86`		`-`
`87`		`- public void webExecute( )`
	`87`	`+`
	`88`	`+ private void initLogger(ServletContext myContext) {`
	`89`	`+ if (logger == null) {`
	`90`	`+ logger = com.genexus.specific.java.LogManager.initialize(myContext.getRealPath("/"), GxRestService.class);`
	`91`	`+ }`
	`92`	`+ }`
	`93`	`+`
	`94`	`+ public void webExecute( )`
`88`	`95`	`{`
`89`	`96`	`}`
`90`	`97`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class GXObjectUploadServices extends GXWebObjectStub`
`18`	`18`	`{`
`19`	`19`	`protected void doExecute(HttpContext context) throws Exception`
`20`	`20`	`{`
`21`		`- new WebApplicationStartup().init(Application.gxCfg, context);`
	`21`	`+ WebApplicationStartup.init(Application.gxCfg, context);`
`22`	`22`	`context.setStream();`
`23`	`23`
`24`	`24`	`try`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,9 @@`
`16`	`16`	`import com.genexus.security.GXResult;`
`17`	`17`	`import com.genexus.security.GXSecurityProvider;`
`18`	`18`
`19`		`-`
`20`	`19`	`public abstract class GXWebObjectStub extends HttpServlet`
`21`	`20`	`{`
`22`		`- public static final ILogger logger = LogManager.getLogger(GXWebObjectStub.class);`
	`21`	`+ public static ILogger logger = null;`
`23`	`22`
`24`	`23`	`private static final boolean DEBUG = DebugFlag.DEBUG;`
`25`	`24`
`@@ -103,8 +102,8 @@ private void dumpRequestInfo(HttpContext httpContext)`
`103`	`102`
`104`	`103`	`private void callExecute(String method, HttpServletRequest req, HttpServletResponse res) throws ServletException`
`105`	`104`	`{`
	`105`	`+ initialize(req, res);`
`106`	`106`	`HttpContext httpContext = null;`
`107`		`- setResponseBufferSize(res);`
`108`	`107`	`try`
`109`	`108`	`{`
`110`	`109`	`String gxcfg = getServletContext().getInitParameter("gxcfg");`
`@@ -217,6 +216,13 @@ else if (IntegratedSecurityLevel() == SECURITY_LOW)`
`217`	`216`	`}`
`218`	`217`	`}`
`219`	`218`
	`219`	`+ private void initialize(HttpServletRequest req, HttpServletResponse res) {`
	`220`	`+ if (logger == null) {`
	`221`	`+ logger = com.genexus.specific.java.LogManager.initialize(req.getServletContext().getRealPath("/"), GXWebObjectStub.class);`
	`222`	`+ }`
	`223`	`+ setResponseBufferSize(res);`
	`224`	`+ }`
	`225`	`+`
`220`	`226`	`private void setResponseBufferSize(HttpServletResponse res) {`
`221`	`227`	`Integer bSize = 0;`
`222`	`228`	`try {`