diff --git a/GSWAdaptors/Apache/mod_gsweb.c b/GSWAdaptors/Apache/mod_gsweb.c
index facbb3b..c7e112e 100644
--- a/GSWAdaptors/Apache/mod_gsweb.c
+++ b/GSWAdaptors/Apache/mod_gsweb.c
@@ -183,7 +183,7 @@ GSWeb_Init(server_rec *p_pServerRec,
 
   pConfig=GSWeb_GetServerConfig(p_pServerRec);
   GSWLog_Init(NULL,GSW_INFO);
-  GSWLog(GSW_INFO,p_pServerRec,
+  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pServerRec,
 	 "GSWeb Init Start Config. Handler: " GSWEB_HANDLER);
   GSWDebugLog(p_pServerRec,
 	 "GSWeb_Init: pConfig->pszGSWeb=%s",
@@ -199,11 +199,11 @@ GSWeb_Init(server_rec *p_pServerRec,
 			 g_szGSWeb_Conf_DocRoot,
 			 pConfig->pszRoot);
 */
-  GSWLog(GSW_INFO,p_pServerRec,
+  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pServerRec,
 	 "GSWeb Init LB Init. Handler: " GSWEB_HANDLER);
   GSWConfig_Init(pDict,p_pServerRec);
 	
-  GSWLog(GSW_INFO,p_pServerRec,
+  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pServerRec,
 	 "GSWeb Init. Handler: " GSWEB_HANDLER);
   GSWDict_Free(pDict);
 };
@@ -302,7 +302,7 @@ GSWeb_Translation(request_rec *p_pRequestRec)
 				     p_pRequestRec->server);
       if (eError!=GSWURLError_OK)
 	{
-	  GSWLog(GSW_ERROR,p_pRequestRec->server,
+	  GSWLog(__FILE__, __LINE__,GSW_ERROR,p_pRequestRec->server,
 		 "GSWeb_Translation Declined (Error %d)",(int)eError);
 	  iRetValue=DECLINED;
 	}
@@ -618,7 +618,7 @@ dieWithMessage(request_rec *p_pRequestRec,
   server_rec      *pServerRec = p_pRequestRec->server;
 
   GSWDebugLog(pServerRec,"Start dieWithMessage");
-  GSWLog(GSW_ERROR,pServerRec,"Send Error Response: %s",p_pszMessage);
+  GSWLog(__FILE__, __LINE__,GSW_ERROR,pServerRec,"Send Error Response: %s",p_pszMessage);
 
   pResponse = GSWHTTPResponse_BuildErrorResponse(NULL,
                                                  p_pStats,
@@ -669,7 +669,7 @@ GSWeb_Handler(request_rec *p_pRequestRec)
   pConfig=GSWeb_GetServerConfig(p_pRequestRec->server);
 
   // Log the request
-  GSWLog(GSW_INFO,
+  GSWLog(__FILE__, __LINE__,GSW_INFO,
 	 pLogServerData,
 	 "GNUstepWeb New request: %s",
 	 p_pRequestRec->uri);
@@ -687,7 +687,7 @@ GSWeb_Handler(request_rec *p_pRequestRec)
 	{
 	  pszURLError=GSWURLErrorMessage(eError,
 					 pLogServerData);
-	  GSWLog(GSW_INFO,pLogServerData,"URL Parsing Error: %s", pszURLError);
+	  GSWLog(__FILE__, __LINE__,GSW_INFO,pLogServerData,"URL Parsing Error: %s", pszURLError);
 	  if (eError==GSWURLError_InvalidAppName)
 	    {
 	      pResponse = GSWDumpConfigFile(&stStats,
@@ -778,7 +778,7 @@ GSWeb_Handler(request_rec *p_pRequestRec)
 			      iRemainingLength=0;
 			    }
 			};
-		      GSWLog(GSW_INFO,pLogServerData,"pszBuffer(%p)=%.*s",
+		      GSWLog(__FILE__, __LINE__,GSW_INFO,pLogServerData,"pszBuffer(%p)=%.*s",
 			     (void *)pszBuffer,
 			     (int)pRequest->uContentLength,
 			     pszBuffer);
diff --git a/GSWAdaptors/common/GSWApp.c b/GSWAdaptors/common/GSWApp.c
index e50a0dc..58665dd 100644
--- a/GSWAdaptors/common/GSWApp.c
+++ b/GSWAdaptors/common/GSWApp.c
@@ -60,12 +60,12 @@ void
 GSWApp_Free(GSWApp *p_pApp)
 {
   if (!p_pApp)
-    GSWLog(GSW_CRITICAL,NULL,"No App to free");
+    GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"No App to free");
   else
     {
       p_pApp->iUsageCounter--;
       if (p_pApp->iUsageCounter<0)
-	GSWLog(GSW_CRITICAL,NULL,
+	GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,
 	       "App  seems to have been freed too much times");
       if (p_pApp->iUsageCounter<=0)
 	{
@@ -90,17 +90,17 @@ GSWApp_AddInstance(GSWApp         *p_pApp,
 {
   if (!p_pApp)
     {
-      GSWLog(GSW_CRITICAL,NULL,"No App to add instance");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"No App to add instance");
     }
   else if (!p_pInstance)
     {
-      GSWLog(GSW_CRITICAL,NULL,"No instance to add");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"No instance to add");
     }
   else
     {
       if (p_pInstance->pApp!=p_pApp)
 	{
-	  GSWLog(GSW_CRITICAL,NULL,"Trying to add instance to another app");
+	  GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"Trying to add instance to another app");
 	  if (p_pInstance->pApp)
 	    p_pInstance->pApp->iUsageCounter--;
 	  p_pInstance->pApp=p_pApp;
@@ -164,7 +164,7 @@ GSWAppInstance_New(GSWApp *p_pApp)
   GSWAppInstance *pInstance=(GSWAppInstance*)calloc(1,sizeof(GSWAppInstance));
   memset(pInstance,0,sizeof(GSWAppInstance));
   if (!p_pApp)
-    GSWLog(GSW_CRITICAL,NULL,"Intance %p created without App",
+    GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"Intance %p created without App",
 	   pInstance);
   pInstance->pApp=p_pApp;
   return pInstance;
diff --git a/GSWAdaptors/common/GSWAppConnectSocket.c b/GSWAdaptors/common/GSWAppConnectSocket.c
index 2e02ff0..ba6551c 100644
--- a/GSWAdaptors/common/GSWAppConnectSocket.c
+++ b/GSWAdaptors/common/GSWAppConnectSocket.c
@@ -58,7 +58,7 @@ AppConnectHandle GSWApp_Open(GSWAppRequest* p_pAppRequest,void* p_pLogServerData
 
   if (!p_pAppRequest)
     {
-      GSWLog(GSW_CRITICAL,p_pLogServerData,
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,
              "No AppRequest !");
       //TODO
     }
@@ -76,7 +76,7 @@ AppConnectHandle GSWApp_Open(GSWAppRequest* p_pAppRequest,void* p_pLogServerData
       pHost=GSWUtil_FindHost(p_pAppRequest->pszHost,p_pLogServerData);
       if (!pHost)
         {
-          GSWLog(GSW_ERROR,p_pLogServerData,
+          GSWLog(__FILE__, __LINE__, GSW_ERROR,p_pLogServerData,
                  "gethostbyname(%s) returns no host",
                  p_pAppRequest->pszHost);
         }
@@ -95,7 +95,7 @@ AppConnectHandle GSWApp_Open(GSWAppRequest* p_pAppRequest,void* p_pLogServerData
           iSocketDescr=socket(pHost->h_addrtype,SOCK_STREAM, 0);
           if (iSocketDescr<0)
             {
-              GSWLog(GSW_ERROR,
+              GSWLog(__FILE__, __LINE__, GSW_ERROR,
                      p_pLogServerData,
                      "Can't Create socket to %s:%d. Error=%d (%s)",
                      p_pAppRequest->pszHost,
@@ -107,7 +107,7 @@ AppConnectHandle GSWApp_Open(GSWAppRequest* p_pAppRequest,void* p_pLogServerData
             {
               if (connect(iSocketDescr,(struct sockaddr*)&sin,sizeof(sin))<0)
                 {
-                  GSWLog(GSW_ERROR,
+                  GSWLog(__FILE__, __LINE__, GSW_ERROR,
                          p_pLogServerData,
                          "Can't connect to %s:%d. Error=%d (%s)",
                          p_pAppRequest->pszHost,
@@ -122,7 +122,7 @@ AppConnectHandle GSWApp_Open(GSWAppRequest* p_pAppRequest,void* p_pLogServerData
                   FILE* pFileRead=fdopen(iSocketDescr,"r");
                   if (!pFileRead)
                     {
-                      GSWLog(GSW_ERROR,
+                      GSWLog(__FILE__, __LINE__, GSW_ERROR,
                              p_pLogServerData,
                              "Can't open for reading. Error=%d (%s)",
                              errno,
@@ -135,7 +135,7 @@ AppConnectHandle GSWApp_Open(GSWAppRequest* p_pAppRequest,void* p_pLogServerData
                       FILE* pFileWrite=fdopen(iSocketDescr,"w");
                       if (!pFileWrite)
                         {
-                          GSWLog(GSW_ERROR,
+                          GSWLog(__FILE__, __LINE__, GSW_ERROR,
                                  p_pLogServerData,
                                  "Can't open for writing. Error=%d (%s)",
                                  errno,
@@ -170,14 +170,14 @@ void GSWApp_Close(AppConnectHandle p_handle,void* p_pLogServerData)
 
   if (!p_handle)
     {
-      GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_Close: no Handle !");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_Close: no Handle !");
     }
   else
     {
       AppConnectSocketHandle handle=(AppConnectSocketHandle)p_handle;
       if (!handle->iSocketDescr)
         {
-          GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_Close: no socket desc !");
+          GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_Close: no socket desc !");
         }
       else
         {
@@ -200,14 +200,14 @@ int GSWApp_SendLine(AppConnectHandle p_handle, CONST char* p_pszBuffer,void* p_p
 
   if (!p_handle)
 	{
-	  GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_SendLine: no Handle !");
+	  GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_SendLine: no Handle !");
 	}
   else
 	{
 	  AppConnectSocketHandle handle=(AppConnectSocketHandle)p_handle;
 	  if (!handle->pFileWrite)
 		{
-		  GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_SendLine: no write file handle !");
+		  GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_SendLine: no write file handle !");
 		}
 	  else
 		{
@@ -218,7 +218,7 @@ int GSWApp_SendLine(AppConnectHandle p_handle, CONST char* p_pszBuffer,void* p_p
 			}
 		  else
 			{
-			  GSWLog(GSW_ERROR,
+			  GSWLog(__FILE__, __LINE__, GSW_ERROR,
 					 p_pLogServerData,
 					 "GSWApp_SendLine failed. Error=%d (%s)",
 					 errno,
@@ -246,14 +246,14 @@ int GSWApp_SendBlock(AppConnectHandle p_handle,
 
   if (!p_handle)
 	{
-	  GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_SendBlock: no Handle !");
+	  GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_SendBlock: no Handle !");
 	}
   else
 	{
 	  AppConnectSocketHandle handle=(AppConnectSocketHandle)p_handle;
 	  if (!handle->pFileWrite)
 		{
-		  GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_SendBlock: no write file handle !");
+		  GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_SendBlock: no write file handle !");
 		}
 	  else
 		{
@@ -261,7 +261,7 @@ int GSWApp_SendBlock(AppConnectHandle p_handle,
 		  fflush(handle->pFileWrite);		  
 		  if (iBytesSent<0)
 			{
-			  GSWLog(GSW_ERROR,
+			  GSWLog(__FILE__, __LINE__, GSW_ERROR,
 					 p_pLogServerData,
 					 "send failed. Error=%d (%s)",
 					 errno,
@@ -290,14 +290,14 @@ int GSWApp_ReceiveLine(AppConnectHandle p_handle,
   *p_pszBuffer=0;
   if (!p_handle)
     {
-      GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_ReceiveLine: no Handle !");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_ReceiveLine: no Handle !");
     }
   else
     {
       AppConnectSocketHandle handle=(AppConnectSocketHandle)p_handle;
       if (!handle->pFileRead)
         {
-          GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_ReceiveLine: no read file handle !");
+          GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_ReceiveLine: no read file handle !");
         }
       else
         {
@@ -331,14 +331,14 @@ int GSWApp_ReceiveBlock(AppConnectHandle p_handle,
 
   if (!p_handle)
     {
-      GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_ReceiveBlock: no Handle !");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_ReceiveBlock: no Handle !");
     }
   else
     {
       AppConnectSocketHandle handle=(AppConnectSocketHandle)p_handle;
       if (!handle->pFileRead)
         {
-          GSWLog(GSW_CRITICAL,p_pLogServerData,"GSWApp_ReceiveBlock: no read file handle !");
+          GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"GSWApp_ReceiveBlock: no read file handle !");
         }
       else
         {
diff --git a/GSWAdaptors/common/GSWAppRequest.c b/GSWAdaptors/common/GSWAppRequest.c
index 217461f..f1a29de 100644
--- a/GSWAdaptors/common/GSWAppRequest.c
+++ b/GSWAdaptors/common/GSWAppRequest.c
@@ -92,7 +92,7 @@ GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest  **p_ppHTTPRequest,
 
   if (!fAppFound)
     {
-      GSWLog(GSW_WARNING,p_pLogServerData,
+      GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData,
              "App '%s' not found",
              p_pAppRequest->pszName);
       //TODO
@@ -118,7 +118,7 @@ GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest  **p_ppHTTPRequest,
       while (!pHTTPResponse && fAppFound && iAttemptsRemaining-->0)
         {
           fAppNotResponding=FALSE;
-          GSWLog(GSW_INFO,p_pLogServerData,"Attempt# %d: Trying to contact %s:%d on %s:%d",
+          GSWLog(__FILE__, __LINE__, GSW_INFO,p_pLogServerData,"Attempt# %d: Trying to contact %s:%d on %s:%d",
                  (int)(APP_CONNECT_RETRIES_NB-iAttemptsRemaining),
                  p_pAppRequest->pszName,
                  p_pAppRequest->iInstance,
@@ -159,7 +159,7 @@ GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest  **p_ppHTTPRequest,
                                              hConnect,
                                              p_pLogServerData) != 0)
                 {
-                  GSWLog(GSW_ERROR,p_pLogServerData,"Failed to send request to application %s:%d on %s:%d",
+                  GSWLog(__FILE__, __LINE__,GSW_ERROR,p_pLogServerData,"Failed to send request to application %s:%d on %s:%d",
                          p_pAppRequest->pszName,
                          p_pAppRequest->iInstance,
                          p_pAppRequest->pszHost,
@@ -205,7 +205,7 @@ GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest  **p_ppHTTPRequest,
                       if (value && (strncmp(value,"YES",3)==0))
 			{
 			  // refuseNewSessions == YES in app
-			  GSWLog(GSW_INFO,p_pLogServerData,
+			  GSWLog(__FILE__, __LINE__, GSW_INFO,p_pLogServerData,
                                  "### This app (%s / %d) is refusing all new sessions ###",
 				 appName, appInstance);
 			  GSWAppInfo_Set(appName, appInstance, TRUE);
@@ -226,7 +226,7 @@ GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest  **p_ppHTTPRequest,
           else
             {
               fAppNotResponding=TRUE;
-              GSWLog(GSW_WARNING,p_pLogServerData,
+              GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData,
                      "%s:%d NOT LISTENING on %s:%d",
                      p_pAppRequest->pszName,
                      p_pAppRequest->iInstance,
@@ -267,7 +267,7 @@ GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest  **p_ppHTTPRequest,
 
       if (!pHTTPResponse)
         {
-          GSWLog(GSW_WARNING,p_pLogServerData,
+          GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData,
                  "Application %s not found or not responding",
                  p_pAppRequest->pszName);
           pHTTPResponse = GSWDumpConfigFile(p_pAppRequest->pStats,
@@ -318,7 +318,7 @@ GSWAppRequest_HandleRequest(GSWHTTPRequest  **p_ppHTTPRequest,
 
   if (!p_pURLComponents)
     {
-      GSWLog(GSW_CRITICAL,p_pLogServerData,
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,
 	     "p_pURLComponents is NULL in GSWAppRequest_HandleRequest");
     }
   else
@@ -400,7 +400,7 @@ GSWAppRequest_HandleRequest(GSWHTTPRequest  **p_ppHTTPRequest,
 			{
 			  stAppRequest.iInstance = atoi(pszInstanceCookie +
 			    strlen(g_szGSWeb_InstanceCookie[GSWNAMES_INDEX]));
-			  GSWLog(GSW_INFO,p_pLogServerData,
+			  GSWLog(__FILE__, __LINE__, GSW_INFO,p_pLogServerData,
 				 "Cookie instance %d from %s",
 				 stAppRequest.iInstance,
 				 pszCookie);
@@ -413,7 +413,7 @@ GSWAppRequest_HandleRequest(GSWHTTPRequest  **p_ppHTTPRequest,
 			    {
 			      stAppRequest.iInstance = atoi(pszInstanceCookie +
 			      strlen(g_szGSWeb_InstanceCookie[WONAMES_INDEX]));
-			      GSWLog(GSW_INFO,p_pLogServerData,
+			      GSWLog(__FILE__, __LINE__, GSW_INFO,p_pLogServerData,
 				     "Cookie instance %d from %s",
 				     stAppRequest.iInstance,
 				     pszCookie);
diff --git a/GSWAdaptors/common/GSWConfig.c b/GSWAdaptors/common/GSWConfig.c
index 9bb4198..cf0fa9b 100644
--- a/GSWAdaptors/common/GSWConfig.c
+++ b/GSWAdaptors/common/GSWConfig.c
@@ -123,7 +123,7 @@ GSWConfig_Init(GSWDict *p_pDict,
       pszPath=GSWDict_ValueForKey(p_pDict,g_szGSWeb_Conf_ConfigFilePath);
       GSWConfig_SetConfigFilePath(pszPath);
     };
-  GSWLog(GSW_INFO,p_pLogServerData,
+  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pLogServerData,
 		 "GSWConfig_Init: %s %s path: %s",
 		 g_szServerStringInfo,g_szAdaptorStringInfo,pszPath);
   GSWLock_Init(g_lockAppList);
@@ -180,7 +180,7 @@ GSWConfig_SetConfigFilePath(CONST char *p_pszConfigFilePath)
     }
   else
     {
-      GSWLog(GSW_CRITICAL,NULL,
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,
         "No path for config file. Add a %s directive in your web server configuration",
          g_szGSWeb_Conf_ConfigFilePath);
     };
@@ -255,7 +255,7 @@ GSWConfig_ReadIFND(CONST char *p_pszConfigPath,
 
   if (!p_pszConfigPath)
     {
-      GSWLog(GSW_CRITICAL,p_pLogServerData,"No path for config file.");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,"No path for config file.");
       eResult=EGSWConfigResult__Error;
     }
   else
@@ -266,7 +266,7 @@ GSWConfig_ReadIFND(CONST char *p_pszConfigPath,
 
       if (timeNow-timePrevious<CONFIG_FILE_STAT_INTERVAL)
         {
-	  GSWLog(GSW_INFO,p_pLogServerData,
+	  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pLogServerData,
 		 "GSWConfig_ReadIFND: Not Reading : Less than %d sec since last read config file.",
 		 (int)CONFIG_FILE_STAT_INTERVAL);
 	  eResult=EGSWConfigResult__NotChanged;
@@ -280,41 +280,41 @@ GSWConfig_ReadIFND(CONST char *p_pszConfigPath,
 	      *p_pLastReadTime = timeNow;
 	      if (stStat.st_mtime>timePrevious) 
 	        {
-		  GSWLog(GSW_INFO,p_pLogServerData,
+		  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pLogServerData,
 		"GSWConfig_ReadIFND: Reading new configuration from %s",
 			 p_pszConfigPath);
 
 		  *p_ppPropList=PLGetProplistWithPath(p_pszConfigPath);
 		  if (*p_ppPropList)
 		    {
-		      GSWLog(GSW_WARNING,p_pLogServerData,
+		      GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData,
 		 "GSWConfig_ReadIFND: New configuration from %s readen",
 			     p_pszConfigPath);
 		    }
 		  else
 		    {
-		      GSWLog(GSW_CRITICAL,p_pLogServerData,
+		      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,
 		   "Can't read configuration file %s (PLGetProplistWithPath).",
 			     p_pszConfigPath);
 		    };
 		}
 	      else
 	        {
-		  GSWLog(GSW_INFO,p_pLogServerData,
+		  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pLogServerData,
 			 "GSWConfig_ReadIFND: Not Reading : config file not modified since last read.");
 		  eResult=EGSWConfigResult__NotChanged;
 		}
 	    }
 	  else
 	    {
-	      GSWLog(GSW_CRITICAL,p_pLogServerData,
+	      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,
 		   "GSWConfig_ReadIFND: config file %s does not exist.",
 		     p_pszConfigPath);
 	      eResult=EGSWConfigResult__Error;
 	    };
 	};
     };
-  GSWLog(GSW_INFO,p_pLogServerData,"GSWConfig_ReadIFND: result= %d",
+  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pLogServerData,"GSWConfig_ReadIFND: result= %d",
 	 (int)eResult);
   return eResult;
 };
@@ -452,7 +452,7 @@ GSWConfig_PropListInstanceToInstance(GSWAppInstance *p_pInstance,
 	};
     };
 
-  GSWLog(GSW_INFO,p_pLogServerData,
+  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pLogServerData,
  "Config: App=%p %s instance %d host %s port %d Valid:%s timeNextRetryTime %d",
 	 p_pApp,
 	 p_pApp->pszName,
@@ -519,7 +519,7 @@ GSWConfig_PropListApplicationToApplication(GSWApp     *p_pApp,
         {
           if (strlen(pszUnavailableUntil)<8) 
             {
-              GSWLog(GSW_WARNING,NULL,
+              GSWLog(__FILE__, __LINE__, GSW_WARNING,NULL,
                      "Bad format for unavailableUntil ('%s'). Should be YYYYMMDD or YYYYMMDD-HHMMSS",
                      pszUnavailableUntil);
             }
@@ -535,7 +535,7 @@ GSWConfig_PropListApplicationToApplication(GSWApp     *p_pApp,
                                 +(pszUnavailableUntil[3]-'0'))-1900;
               if (tmStruct.tm_year<0)
                 {
-                  GSWLog(GSW_WARNING,p_pLogServerData,
+                  GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData,
                          "Bad year (%d) in unavailableUntil ('%s')",
                          (int)(tmStruct.tm_year+1900),
                          pszUnavailableUntil);
@@ -547,7 +547,7 @@ GSWConfig_PropListApplicationToApplication(GSWApp     *p_pApp,
                                    +(pszUnavailableUntil[5]-'0'))-1;
                   if (tmStruct.tm_mon<0 || tmStruct.tm_mon>11)
                     {
-                      GSWLog(GSW_WARNING,p_pLogServerData,
+                      GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData,
                              "Bad month (%d) in unavailableUntil ('%s')",
                              (int)(tmStruct.tm_mon+1),
                              pszUnavailableUntil);
@@ -558,7 +558,7 @@ GSWConfig_PropListApplicationToApplication(GSWApp     *p_pApp,
                                         +(pszUnavailableUntil[7]-'0'));              
                       if (tmStruct.tm_mday<1 || tmStruct.tm_mday>31)
                         {
-                          GSWLog(GSW_WARNING,p_pLogServerData,
+                          GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData,
                                  "Bad month day (%d) in unavailableUntil ('%s')",
                                  (int)(tmStruct.tm_mday),
                                  pszUnavailableUntil);
diff --git a/GSWAdaptors/common/GSWDict.c b/GSWAdaptors/common/GSWDict.c
index 38e6777..4eea9ba 100644
--- a/GSWAdaptors/common/GSWDict.c
+++ b/GSWAdaptors/common/GSWDict.c
@@ -34,7 +34,7 @@ GSWDict_SetCapacity(GSWDict *p_pDict,unsigned int p_uCapacity)
 {
   if (!p_pDict)
     {
-      GSWLog(GSW_CRITICAL,NULL,"NULL GSWDict");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"NULL GSWDict");
     }
   else
     {
@@ -65,7 +65,7 @@ GSWDict_FreeElem(GSWDictElem *p_pElem,void *p_pData)
 {
   if (!p_pElem)
     {
-      GSWLog(GSW_CRITICAL,NULL,"NULL GSWDict pElem");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"NULL GSWDict pElem");
     }
   else
     {
@@ -93,7 +93,7 @@ GSWDict_Free(GSWDict *p_pDict)
 {
   if (!p_pDict)
     {
-      GSWLog(GSW_ERROR,NULL,"NULL GSWDict");
+      GSWLog(__FILE__, __LINE__, GSW_ERROR,NULL,"NULL GSWDict");
     }
   else
     {
@@ -122,7 +122,7 @@ GSWDict_Count(GSWDict *p_pDict)
   unsigned int uCount=0;
   if (!p_pDict)
     {
-      GSWLog(GSW_CRITICAL,NULL,"NULL GSWDict");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"NULL GSWDict");
     }
   else
     {
@@ -144,7 +144,7 @@ GSWDict_Add(GSWDict    *p_pDict,
   GSWDictElem *pElem=NULL;
   if (!p_pDict)
     {
-      GSWLog(GSW_CRITICAL,NULL,"NULL GSWDict");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"NULL GSWDict");
     }
   else
     {
@@ -165,7 +165,7 @@ GSWDict_Add(GSWDict    *p_pDict,
 	};
       if (!pElem)
 	{
-	  GSWLog(GSW_CRITICAL,NULL,"No pElem in GSWDict Add");
+	  GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"No pElem in GSWDict Add");
 	};
       pElem->pszKey=strdup(p_pszKey);
       pElem->pValue=p_pValue;
@@ -198,7 +198,7 @@ GSWDict_FindKey(GSWDict    *p_pDict,
   GSWDictElem *pElem=NULL;
   if (!p_pDict)
     {
-      GSWLog(GSW_CRITICAL,NULL,"NULL GSWDict");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"NULL GSWDict");
     }
   else
     {
@@ -233,7 +233,7 @@ GSWDict_PerformForAllElem(GSWDict *p_pDict,
 {
   if (!p_pDict)
     {
-      GSWLog(GSW_CRITICAL,NULL,"NULL GSWDict");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"NULL GSWDict");
     }
   else
     {
@@ -253,7 +253,7 @@ GSWDict_AllKeys(GSWDict *p_pDict)
   GSWList *pList=NULL;
   if (!p_pDict)
     {
-      GSWLog(GSW_CRITICAL,NULL,"NULL GSWDict");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"NULL GSWDict");
     }
   else
     {
@@ -273,11 +273,11 @@ void GSWDict_AddStringDupFromDict(GSWDict *p_pDictDst,GSWDict *p_pDictSrc)
 {
   if (!p_pDictSrc)
     {
-      GSWLog(GSW_CRITICAL,NULL,"NULL GSWDict src");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"NULL GSWDict src");
     }
   else if (!p_pDictDst)
     {
-      GSWLog(GSW_CRITICAL,NULL,"NULL GSWDict dst");
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,NULL,"NULL GSWDict dst");
     }
   else
     {
diff --git a/GSWAdaptors/common/GSWHTTPRequest.c b/GSWAdaptors/common/GSWHTTPRequest.c
index ead8c19..493bb88 100644
--- a/GSWAdaptors/common/GSWHTTPRequest.c
+++ b/GSWAdaptors/common/GSWHTTPRequest.c
@@ -99,7 +99,7 @@ GSWHTTPRequest_ValidateMethod(GSWHTTPRequest *p_pHTTPRequest,
   GSWDebugLog(p_pLogServerData,"Start GSWHTTPRequest_ValidateMethod");
   if (!p_pHTTPRequest)
     {
-      GSWLog(GSW_CRITICAL,p_pLogServerData,
+      GSWLog(__FILE__, __LINE__, GSW_CRITICAL,p_pLogServerData,
 	     "No Request in GSWHTTPRequest_ValidateMethod");
       pszMsg="No Request in GSWHTTPRequest_ValidateMethod";
     }
@@ -201,7 +201,7 @@ GSWHTTPRequest_HTTPToAppRequest(GSWHTTPRequest   *p_pHTTPRequest,
   
   GSWDict_Log(p_pHTTPRequest->pHeaders,p_pLogServerData);
 
-  GSWLog(GSW_INFO,p_pLogServerData,"App Request: %s",
+  GSWLog(__FILE__, __LINE__, GSW_INFO,p_pLogServerData,"App Request: %s",
 	 p_pHTTPRequest->pszRequest);
 
   GSWDebugLog(p_pLogServerData,"Stop GSWHTTPRequest_HTTPToAppRequest");
diff --git a/GSWAdaptors/common/GSWHTTPResponse.c b/GSWAdaptors/common/GSWHTTPResponse.c
index 42499e5..cf74c0d 100644
--- a/GSWAdaptors/common/GSWHTTPResponse.c
+++ b/GSWAdaptors/common/GSWHTTPResponse.c
@@ -93,7 +93,7 @@ GSWHTTPResponse_New(GSWTimeStats   *p_pStats,
 	};
     };
   if (!fOk)
-    GSWLog(GSW_ERROR,p_pLogServerData,"Invalid response");
+    GSWLog(__FILE__, __LINE__, GSW_ERROR,p_pLogServerData,"Invalid response");
   return pHTTPResponse;
 };
 
@@ -429,7 +429,7 @@ GSWHTTPResponse_GetResponse(GSWTimeStats   *p_pStats,
 	  GSWDebugLog(p_pLogServerData,"iReceivedCount=%d",iReceivedCount);
 	  if (iReceivedCount!= pHTTPResponse->uContentLength)
 	    {
-	      GSWLog(GSW_ERROR,p_pLogServerData,
+	      GSWLog(__FILE__, __LINE__, GSW_ERROR,p_pLogServerData,
 		     "Content received (%i) doesn't equal to ContentLength (%u). Too bad, same player shoot again !",
                      iReceivedCount,
                      pHTTPResponse->uContentLength);
@@ -464,7 +464,7 @@ GSWHTTPResponse_GetResponse(GSWTimeStats   *p_pStats,
       if (pHTTPResponse->pContent)
         {
 	  char szTraceBuffer[pHTTPResponse->uContentLength+1];
-	  GSWLog(GSW_INFO,p_pLogServerData,"\ncontent (%d Bytes)=\n",
+	  GSWLog(__FILE__, __LINE__, GSW_INFO,p_pLogServerData,"\ncontent (%d Bytes)=\n",
 	         pHTTPResponse->uContentLength);
 	  memcpy(szTraceBuffer,pHTTPResponse->pContent,
 		 pHTTPResponse->uContentLength);
@@ -474,7 +474,7 @@ GSWHTTPResponse_GetResponse(GSWTimeStats   *p_pStats,
 		      "%.*s",
 		      (int)pHTTPResponse->uContentLength,
 		      szTraceBuffer);
-//	  GSWLog(GSW_INFO,p_pLogServerData,"\nEND\n");
+//	  GSWLog(__FILE__, __LINE__, GSW_INFO,p_pLogServerData,"\nEND\n");
 	};
 #endif
 */
@@ -572,7 +572,7 @@ GSWHTTPResponse_BuildStatusResponse(GSWHTTPRequest *p_pHTTPRequest,
 
   GSWDebugLog(p_pLogServerData,
 	 "Start GSWHTTPResponse_BuildStatusResponse");
-  GSWLog(GSW_INFO,p_pLogServerData,"Build Status Page.");
+  GSWLog(__FILE__, __LINE__, GSW_INFO,p_pLogServerData,"Build Status Page.");
   GSWConfig_LoadConfiguration(p_pLogServerData);
   GSWDict_AddString(pHTTPResponse->pHeaders,
 		    g_szHeader_ContentType,
@@ -630,7 +630,7 @@ GSWDumpConfigFile(GSWTimeStats   *p_pStats,
   char             szReqAppName[MAXPATHLEN]="Unknown";
 
   GSWDebugLog(p_pLogServerData,"Start GSWDumpConfigFile");
-  GSWLog(GSW_INFO,p_pLogServerData,"Creating Applications Page.");
+  GSWLog(__FILE__, __LINE__, GSW_INFO,p_pLogServerData,"Creating Applications Page.");
   if (!g_pszLocalHostName)
     {
       char szHostName[MAXHOSTNAMELEN+1];
diff --git a/GSWAdaptors/common/GSWLoadBalancing.c b/GSWAdaptors/common/GSWLoadBalancing.c
index 5872549..ff0a4b1 100644
--- a/GSWAdaptors/common/GSWLoadBalancing.c
+++ b/GSWAdaptors/common/GSWLoadBalancing.c
@@ -84,7 +84,7 @@ GSWLoadBalancing_FindApp(GSWAppRequest    *p_pAppRequest,
         {
           if (!pAppInstance->pApp)
         	{
-        	  GSWLog(GSW_CRITICAL,p_pLogServerData,
+        	  GSWLog(__FILE__, __LINE__,GSW_CRITICAL,p_pLogServerData,
         		 "AppInstance pApp is null pAppInstance=%p",
         		 pAppInstance);
         	};
@@ -94,7 +94,7 @@ GSWLoadBalancing_FindApp(GSWAppRequest    *p_pAppRequest,
         	    time(&curTime);
         	  if (pAppInstance->timeNextRetryTime<curTime)
         	    {
-        	      GSWLog(GSW_WARNING,
+        	      GSWLog(__FILE__, __LINE__,GSW_WARNING,
         		     p_pLogServerData,
                                     "LoadBalance: Instance %s:%d was marked dead for %d secs. Now resurecting !",
         		     p_pAppRequest->pszName, 
@@ -265,7 +265,7 @@ GSWLoadBalancing_MarkNotRespondingApp(GSWAppRequest *p_pAppRequest,
   pAppInstance->uOpenedRequestsNb--;
   pAppInstance->uNotRespondingRequestsNb++;
   pAppInstance->timeNextRetryTime=now+APP_CONNECT_RETRY_DELAY;
-  GSWLog(GSW_WARNING,p_pLogServerData,
+  GSWLog(__FILE__, __LINE__,GSW_WARNING,p_pLogServerData,
          "Marking %s unresponsive for %d s. notResonding count: %u handled count: %u",
 	 p_pAppRequest->pszName,(int)APP_CONNECT_RETRY_DELAY,
          pAppInstance->uNotRespondingRequestsNb,
@@ -287,7 +287,7 @@ GSWLoadBalancing_StartAppRequest(GSWAppRequest *p_pAppRequest,
   if (pAppInstance->timeNextRetryTime!=0)
     {
       pAppInstance->timeNextRetryTime=0;
-      GSWLog(GSW_WARNING,p_pLogServerData,
+      GSWLog(__FILE__, __LINE__,GSW_WARNING,p_pLogServerData,
 	     "Marking %s as alive",p_pAppRequest->pszName);
     };
 }
diff --git a/GSWAdaptors/common/GSWStats.c b/GSWAdaptors/common/GSWStats.c
index c9a96d5..ec80982 100644
--- a/GSWAdaptors/common/GSWStats.c
+++ b/GSWAdaptors/common/GSWStats.c
@@ -183,7 +183,7 @@ void GSWStats_logStats(GSWTimeStats *p_pStats,
                        void         *p_pLogServerData)
 {
   char* formattedStats=GSWStats_formatStats(p_pStats,NULL,p_pLogServerData);
-  GSWLog(GSW_INFO,p_pLogServerData,"%s",formattedStats);
+  GSWLog(__FILE__, __LINE__,GSW_INFO,p_pLogServerData,"%s",formattedStats);
   if (formattedStats)
     free(formattedStats);
 };
diff --git a/GSWAdaptors/common/GSWURLUtil.c b/GSWAdaptors/common/GSWURLUtil.c
index 8505eb5..df1e697 100644
--- a/GSWAdaptors/common/GSWURLUtil.c
+++ b/GSWAdaptors/common/GSWURLUtil.c
@@ -202,7 +202,7 @@ GSWParseURL(GSWURLComponents *p_pURLComponents,
   if (!pURLCPrefix->pszStart || pURLCPrefix->iLength<=0)
     {
       eError=GSWURLError_InvalidPrefix;
-      GSWLog(GSW_ERROR,p_pLogServerData,"ParseURL GSWURLError_InvalidPrefix");
+      GSWLog(__FILE__, __LINE__, GSW_ERROR,p_pLogServerData,"ParseURL GSWURLError_InvalidPrefix");
     }
   else
     {
@@ -212,7 +212,7 @@ GSWParseURL(GSWURLComponents *p_pURLComponents,
       if (!pURLCAppName->pszStart || pURLCAppName->iLength<=0)
 	{
 	  eError=GSWURLError_InvalidAppName;
-	  GSWLog(GSW_ERROR,p_pLogServerData,
+	  GSWLog(__FILE__, __LINE__, GSW_ERROR,p_pLogServerData,
 		 "ParseURL GSWURLError_InvalidAppName");
 	}
       else
@@ -223,7 +223,7 @@ GSWParseURL(GSWURLComponents *p_pURLComponents,
 	  if (!pURLCAppNum->pszStart)
 	    {
 	      eError=GSWURLError_InvalidAppNumber;
-	      GSWLog(GSW_ERROR,p_pLogServerData,
+	      GSWLog(__FILE__, __LINE__, GSW_ERROR,p_pLogServerData,
 		     "ParseURL GSWURLError_InvalidAppNumber");
 	    }
 	  else
@@ -236,7 +236,7 @@ GSWParseURL(GSWURLComponents *p_pURLComponents,
 		  && pURLCReqHandlerPath->iLength>0)
 		{
 		  eError=GSWURLError_InvalidRequestHandlerKey;
-		  GSWLog(GSW_ERROR,p_pLogServerData,
+		  GSWLog(__FILE__, __LINE__, GSW_ERROR,p_pLogServerData,
 			 "ParseURL GSWURLError_InvalidRequestHandlerKey");
 		}
 	      else
diff --git a/GSWAdaptors/common/GSWUtil.c b/GSWAdaptors/common/GSWUtil.c
index 024c4a9..e85b131 100644
--- a/GSWAdaptors/common/GSWUtil.c
+++ b/GSWAdaptors/common/GSWUtil.c
@@ -162,11 +162,11 @@ VGSWLogSizedIntern(char       *file,
       
 #if defined(Apache)
 #if defined(Apache2)
-      ap_log_error(APLOG_MARK,p_iLevel,0,
+      ap_log_error(file,line,p_iLevel,0,
                    (server_rec *)p_pLogServerData,
                    "GSWeb[%lu]: %s",(unsigned long)getpid(),szBuffer);
 #else
-      ap_log_error(APLOG_MARK,p_iLevel,
+      ap_log_error(file,line,p_iLevel,
                    (server_rec *)p_pLogServerData,
                    "GSWeb[%lu]: %s",(unsigned long)getpid(),szBuffer);
 #endif
@@ -176,7 +176,10 @@ VGSWLogSizedIntern(char       *file,
 
 //--------------------------------------------------------------------
 void
-GSWLog(int         p_iLevel,
+GSWLog(
+       char       *file,
+		   int         line,
+		   int         p_iLevel,
 #if	defined(Apache)
        server_rec *p_pLogServerData,
 #else
@@ -186,8 +189,9 @@ GSWLog(int         p_iLevel,
 {
   va_list ap;
   va_start(ap,p_pszFormat);
-  VGSWLogSizedIntern(NULL,
-		     0,
+  VGSWLogSizedIntern(
+		     file,
+		     line,
 		     NULL,
 		     p_iLevel,
 		     p_pLogServerData,
@@ -594,14 +598,14 @@ GSWUtil_HostLookup(CONST char *p_pszHost,
 
   if (!pHost)
     {
-      GSWLog(GSW_ERROR,p_pLogServerData,
+      GSWLog(__FILE__, __LINE__,GSW_ERROR,p_pLogServerData,
 	     "gethostbyname(%s) returns no host: %s",
 	     p_pszHost,
 	     hstrerror(error));
     }
   else if (pHost->h_addrtype != AF_INET)
     {
-      GSWLog(GSW_ERROR,p_pLogServerData,"Wrong address type in hostptr for host %s",p_pszHost);
+      GSWLog(__FILE__, __LINE__,GSW_ERROR,p_pLogServerData,"Wrong address type in hostptr for host %s",p_pszHost);
     };
   if (pHost)
     pHost=GSWUtil_CopyHostent(pHost);
diff --git a/GSWAdaptors/common/GSWUtil.h b/GSWAdaptors/common/GSWUtil.h
index 95a4eb3..eb3f4e7 100644
--- a/GSWAdaptors/common/GSWUtil.h
+++ b/GSWAdaptors/common/GSWUtil.h
@@ -86,7 +86,7 @@ long GSWTime_msecPart(GSWTime t);
 	{ if (!(condition)) \
 		{ \
                   char* format=0; \
-                  GSWLog(GSW_CRITICAL,p_pLogServerData,"ARGHH"); \
+                  GSWLog(__FILE__, __LINE__,GSW_CRITICAL,p_pLogServerData,"ARGHH"); \
                   format=malloc(strlen(p_pszFormat)+strlen(__FILE__)+101); \
   		  sprintf(format,"In %s (%d): %s",__FILE__,__LINE__,p_pszFormat); \
 		  free(format); \
@@ -94,7 +94,9 @@ long GSWTime_msecPart(GSWTime t);
 
 //====================================================================
 // Log Functions
-void GSWLog(int p_iLevel,
+void GSWLog(       char       *file,
+		   int         line,
+int p_iLevel,
 #if	defined(Apache)
 	    server_rec *p_pLogServerData,
 #else
@@ -103,9 +105,9 @@ void GSWLog(int p_iLevel,
 	    CONST char *p_pszFormat, ...);
 
 #define GSWDebugLog(p_pLogServerData,p_pszFormat, args...); \
-			GSWLog(GSW_DEBUG,p_pLogServerData,p_pszFormat,  ## args);
+			GSWLog(__FILE__, __LINE__,GSW_DEBUG,p_pLogServerData,p_pszFormat,  ## args);
 #define GSWDebugLogCond(condition,p_pLogServerData,p_pszFormat, args...); \
-			{ if ((condition)) GSWLog(GSW_DEBUG,p_pLogServerData,p_pszFormat,  ## args);};
+			{ if ((condition)) GSWLog(__FILE__, __LINE__,GSW_DEBUG,p_pLogServerData,p_pszFormat,  ## args);};
 
 void GSWLogSized(int p_iLevel,
 #if	defined(Apache)