mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-05-30 16:50:52 +00:00
*** empty log message ***
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@6293 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon
parent
b45dc89478
commit
b13501c8e3
62 changed files with 3645 additions and 1770 deletions
|
|
@ -30,6 +30,7 @@
|
|||
#include "config.h"
|
||||
#include "GSWUtil.h"
|
||||
#include "GSWDict.h"
|
||||
#include "GSWString.h"
|
||||
#include "GSWConfig.h"
|
||||
#include "GSWURLUtil.h"
|
||||
#include "GSWAppRequestStruct.h"
|
||||
|
|
@ -39,102 +40,12 @@
|
|||
#include "GSWAppRequest.h"
|
||||
#include "GSWHTTPHeaders.h"
|
||||
#include "GSWLoadBalancing.h"
|
||||
#include "GSWTemplates.h"
|
||||
|
||||
unsigned long glbRequestsNb = 0;
|
||||
unsigned long glbResponsesNb = 0;
|
||||
|
||||
|
||||
GSWHTTPResponse* GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest** p_ppHTTPRequest,
|
||||
GSWURLComponents* p_pURLComponents,
|
||||
GSWAppRequest* p_pAppRequest,
|
||||
CONST char* p_pszHTTPVersion,
|
||||
void* p_pLogServerData);
|
||||
|
||||
GSWHTTPResponse* GSWAppRequest_HandleRequest(GSWHTTPRequest** p_ppHTTPRequest,
|
||||
GSWURLComponents* p_pURLComponents,
|
||||
CONST char* p_pszHTTPVersion,
|
||||
CONST char* p_pszDocRoot,
|
||||
CONST char* p_pszTestAppName,
|
||||
void* p_pLogServerData)
|
||||
{
|
||||
GSWHTTPResponse* pHTTPResponse=NULL;
|
||||
glbRequestsNb++;
|
||||
|
||||
if (p_pURLComponents->stAppName.iLength<=0
|
||||
|| !p_pURLComponents->stAppName.pszStart)
|
||||
{
|
||||
pHTTPResponse=GSWHTTPResponse_BuildErrorResponse("No Application Name");
|
||||
}
|
||||
else
|
||||
{
|
||||
char szAppName[MAXPATHLEN+1]="";
|
||||
char szHost[MAXHOSTNAMELEN+1]="";
|
||||
GSWAppRequest stAppRequest;
|
||||
memset(&stAppRequest,0,sizeof(stAppRequest));
|
||||
|
||||
// Get App Name
|
||||
strncpy(szAppName,
|
||||
p_pURLComponents->stAppName.pszStart,
|
||||
p_pURLComponents->stAppName.iLength);
|
||||
szAppName[p_pURLComponents->stAppName.iLength]=0;
|
||||
|
||||
DeleteTrailingSlash(szAppName);
|
||||
if (strcmp(szAppName,p_pszTestAppName) == 0)
|
||||
pHTTPResponse=GSWHTTPResponse_BuildTestResponse(p_pLogServerData,*p_ppHTTPRequest);
|
||||
else
|
||||
{
|
||||
// Get Host Name
|
||||
if (p_pURLComponents->stAppHost.iLength>0 && p_pURLComponents->stAppHost.pszStart)
|
||||
{
|
||||
strncpy(szHost,
|
||||
p_pURLComponents->stAppHost.pszStart,
|
||||
p_pURLComponents->stAppHost.iLength);
|
||||
szHost[p_pURLComponents->stAppHost.iLength] = '\0';
|
||||
};
|
||||
|
||||
// Get Request Instance Number
|
||||
|
||||
// in URL ?
|
||||
if (p_pURLComponents->stAppNumber.iLength>0 && p_pURLComponents->stAppNumber.pszStart)
|
||||
stAppRequest.iInstance = atoi(p_pURLComponents->stAppNumber.pszStart);
|
||||
|
||||
// In Cookie ?
|
||||
else
|
||||
{
|
||||
CONST char* pszCookie=GSWHTTPRequest_HeaderForKey(*p_ppHTTPRequest,g_szHeader_Cookie);
|
||||
if (pszCookie)
|
||||
{
|
||||
CONST char* pszInstanceCookie=strstr(pszCookie, g_szGSWeb_InstanceCookie);
|
||||
if (pszInstanceCookie)
|
||||
{
|
||||
stAppRequest.iInstance = atoi(pszInstanceCookie + strlen(g_szGSWeb_InstanceCookie));
|
||||
GSWLog(GSW_INFO,p_pLogServerData,"Cookie instance %d from %s",
|
||||
stAppRequest.iInstance,
|
||||
pszCookie);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
stAppRequest.pszName = szAppName;
|
||||
stAppRequest.pszHost = szHost;
|
||||
stAppRequest.pszDocRoot = p_pszDocRoot;
|
||||
stAppRequest.pRequest = *p_ppHTTPRequest;
|
||||
stAppRequest.uURLVersion = (p_pURLComponents->stVersion.pszStart) ?
|
||||
atoi(p_pURLComponents->stVersion.pszStart) : GSWEB_VERSION_MAJOR;
|
||||
|
||||
GSWHTTPRequest_AddHeader(*p_ppHTTPRequest,
|
||||
g_szHeader_GSWeb_ServerAdaptor,
|
||||
g_szGSWeb_ServerAndAdaptorVersion);
|
||||
pHTTPResponse=GSWAppRequest_SendAppRequestToApp(p_ppHTTPRequest,
|
||||
p_pURLComponents,
|
||||
&stAppRequest,
|
||||
p_pszHTTPVersion,
|
||||
p_pLogServerData);
|
||||
};
|
||||
};
|
||||
return pHTTPResponse;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
GSWHTTPResponse* GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest** p_ppHTTPRequest,
|
||||
GSWURLComponents* p_pURLComponents,
|
||||
GSWAppRequest* p_pAppRequest,
|
||||
|
|
@ -143,33 +54,37 @@ GSWHTTPResponse* GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest** p_ppHTTPRequ
|
|||
{
|
||||
GSWHTTPResponse* pHTTPResponse=NULL;
|
||||
BOOL fAppFound=FALSE;
|
||||
BOOL fAppNotResponding=FALSE;
|
||||
int iAttemptsRemaining=APP_CONNECT_RETRIES_NB;
|
||||
AppConnectHandle hConnect=NULL;
|
||||
GSWLog(GSW_DEBUG,p_pLogServerData,"Start GSWAppRequest_SendAppRequestToApp");
|
||||
|
||||
if (p_pAppRequest->iInstance)
|
||||
fAppFound = GSWLoadBalancing_FindInstance(p_pLogServerData,p_pAppRequest);
|
||||
fAppFound = GSWLoadBalancing_FindInstance(p_pAppRequest,p_pLogServerData);
|
||||
else
|
||||
fAppFound = GSWLoadBalancing_FindApp(p_pLogServerData,p_pAppRequest);
|
||||
fAppFound = GSWLoadBalancing_FindApp(p_pAppRequest,p_pLogServerData);
|
||||
|
||||
if (!fAppFound)
|
||||
{
|
||||
GSWLog(GSW_WARNING,p_pLogServerData,"App not found");
|
||||
//TODO
|
||||
// Call AppStart daemon
|
||||
};
|
||||
|
||||
while (!pHTTPResponse && fAppFound && iAttemptsRemaining-->0)
|
||||
{
|
||||
fAppNotResponding=FALSE;
|
||||
GSWLog(GSW_INFO,p_pLogServerData,"Trying to contact %s:%d on %s(%d)",
|
||||
p_pAppRequest->pszName,
|
||||
p_pAppRequest->iInstance,
|
||||
p_pAppRequest->pszHost,
|
||||
p_pAppRequest->iPort);
|
||||
|
||||
hConnect = GSWApp_Open(p_pLogServerData,p_pAppRequest);
|
||||
hConnect = GSWApp_Open(p_pAppRequest,p_pLogServerData);
|
||||
if (hConnect)
|
||||
{
|
||||
if (p_pAppRequest->eType==EAppType_LoadBalanced)
|
||||
GSWLoadBalancing_StartAppRequest(p_pLogServerData,p_pAppRequest);
|
||||
GSWLoadBalancing_StartAppRequest(p_pAppRequest,p_pLogServerData);
|
||||
|
||||
GSWLog(GSW_INFO,p_pLogServerData,"%s:%d on %s(%d) connected",
|
||||
p_pAppRequest->pszName,
|
||||
|
|
@ -180,13 +95,16 @@ GSWHTTPResponse* GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest** p_ppHTTPRequ
|
|||
GSWHTTPRequest_HTTPToAppRequest(*p_ppHTTPRequest,
|
||||
p_pAppRequest,
|
||||
p_pURLComponents,
|
||||
p_pszHTTPVersion);
|
||||
if (GSWHTTPRequest_SendRequest(p_pLogServerData,*p_ppHTTPRequest, hConnect) != 0)
|
||||
p_pszHTTPVersion,
|
||||
p_pLogServerData);
|
||||
if (GSWHTTPRequest_SendRequest(*p_ppHTTPRequest,
|
||||
hConnect,
|
||||
p_pLogServerData) != 0)
|
||||
{
|
||||
GSWLog(GSW_ERROR,p_pLogServerData,"Failed to send request");
|
||||
GSWApp_Close(p_pLogServerData,hConnect);
|
||||
GSWApp_Close(hConnect,p_pLogServerData);
|
||||
hConnect=NULL;
|
||||
pHTTPResponse=GSWHTTPResponse_BuildErrorResponse("No Response");
|
||||
fAppNotResponding=TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -195,14 +113,13 @@ GSWHTTPResponse* GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest** p_ppHTTPRequ
|
|||
(*p_ppHTTPRequest)->pszRequest);
|
||||
|
||||
p_pAppRequest->pRequest = NULL;
|
||||
pHTTPResponse = GSWHTTPResponse_GetResponse(p_pLogServerData,hConnect);
|
||||
// GSWLog(GSW_INFO,p_pLogServerData,"GetResponse End pHTTPResponse=%p",pHTTPResponse);
|
||||
pHTTPResponse = GSWHTTPResponse_GetResponse(hConnect,p_pLogServerData);
|
||||
p_pAppRequest->pResponse = pHTTPResponse;
|
||||
|
||||
if (p_pAppRequest->eType == EAppType_LoadBalanced)
|
||||
GSWLoadBalancing_StopAppRequest(p_pLogServerData,p_pAppRequest);
|
||||
GSWLoadBalancing_StopAppRequest(p_pAppRequest,p_pLogServerData);
|
||||
|
||||
GSWApp_Close(p_pLogServerData,hConnect);
|
||||
GSWApp_Close(hConnect,p_pLogServerData);
|
||||
hConnect=NULL;
|
||||
|
||||
glbResponsesNb++;
|
||||
|
|
@ -217,7 +134,8 @@ GSWHTTPResponse* GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest** p_ppHTTPRequ
|
|||
}
|
||||
else
|
||||
{
|
||||
GSWLog(GSW_INFO,p_pLogServerData,"%s:%d NOT LISTENING on %s(%d)",
|
||||
fAppNotResponding=TRUE;
|
||||
GSWLog(GSW_WARNING,p_pLogServerData,"%s:%d NOT LISTENING on %s:%d",
|
||||
p_pAppRequest->pszName,
|
||||
p_pAppRequest->iInstance,
|
||||
p_pAppRequest->pszHost,
|
||||
|
|
@ -225,26 +143,31 @@ GSWHTTPResponse* GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest** p_ppHTTPRequ
|
|||
//TODO
|
||||
/*
|
||||
if (p_pAppRequest->eType == EAppType_Auto)
|
||||
GSWLoadBalancing_MarkNotRespondingApp(p_pLogServerData,p_pAppRequest);
|
||||
GSWLoadBalancing_MarkNotRespondingApp(p_pAppRequest,p_pLogServerData);
|
||||
|
||||
else*/ if (p_pAppRequest->eType == EAppType_LoadBalanced)
|
||||
else*/ if (p_pAppRequest->eType==EAppType_LoadBalanced)
|
||||
{
|
||||
GSWLoadBalancing_MarkNotRespondingApp(p_pLogServerData,p_pAppRequest);
|
||||
if (iAttemptsRemaining-- > 0)
|
||||
fAppFound = GSWLoadBalancing_FindApp(p_pLogServerData,p_pAppRequest);
|
||||
GSWLoadBalancing_MarkNotRespondingApp(p_pAppRequest,p_pLogServerData);
|
||||
if (iAttemptsRemaining-->0)
|
||||
fAppFound=GSWLoadBalancing_FindApp(p_pAppRequest,p_pLogServerData);
|
||||
};
|
||||
pHTTPResponse = GSWHTTPResponse_BuildErrorResponse("No Response");
|
||||
};
|
||||
};
|
||||
if (fAppNotResponding)
|
||||
{
|
||||
pHTTPResponse = GSWHTTPResponse_BuildErrorResponse(p_pAppRequest,
|
||||
GSWTemplate_ErrorNoResponseMessage(TRUE),
|
||||
p_pLogServerData);
|
||||
};
|
||||
if (!pHTTPResponse)
|
||||
{
|
||||
GSWLog(GSW_INFO,p_pLogServerData,
|
||||
GSWLog(GSW_WARNING,p_pLogServerData,
|
||||
"Application %s not found or not responding",
|
||||
p_pAppRequest->pszName);
|
||||
pHTTPResponse = GSWDumpConfigFile(p_pLogServerData,p_pURLComponents);
|
||||
pHTTPResponse = GSWDumpConfigFile(p_pURLComponents,p_pLogServerData);
|
||||
if (!pHTTPResponse)
|
||||
{
|
||||
pHTTPResponse = GSWHTTPResponse_BuildErrorResponse("No App Found");
|
||||
pHTTPResponse = GSWHTTPResponse_BuildErrorResponse(p_pAppRequest,"No App Found",p_pLogServerData);
|
||||
pHTTPResponse->uStatus = 404;
|
||||
if (pHTTPResponse->pszStatusMessage)
|
||||
{
|
||||
|
|
@ -254,7 +177,108 @@ GSWHTTPResponse* GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest** p_ppHTTPRequ
|
|||
pHTTPResponse->pszStatusMessage = strdup("File Not found");
|
||||
}
|
||||
};
|
||||
GSWHTTPRequest_Free(*p_ppHTTPRequest);
|
||||
GSWHTTPRequest_Free(*p_ppHTTPRequest,p_pLogServerData);
|
||||
*p_ppHTTPRequest=NULL;
|
||||
GSWLog(GSW_DEBUG,p_pLogServerData,"Stop GSWAppRequest_SendAppRequestToApp");
|
||||
return pHTTPResponse;
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
GSWHTTPResponse* GSWAppRequest_HandleRequest(GSWHTTPRequest** p_ppHTTPRequest,
|
||||
GSWURLComponents* p_pURLComponents,
|
||||
CONST char* p_pszHTTPVersion,
|
||||
CONST char* p_pszDocRoot,
|
||||
CONST char* p_pszTestAppName,
|
||||
void* p_pLogServerData)
|
||||
{
|
||||
GSWHTTPResponse* pHTTPResponse=NULL;
|
||||
GSWLog(GSW_DEBUG,p_pLogServerData,"Start GSWAppRequest_HandleRequest");
|
||||
glbRequestsNb++;
|
||||
if (!p_pURLComponents)
|
||||
{
|
||||
GSWLog(GSW_CRITICAL,p_pLogServerData,"p_pURLComponents is NULL in GSWAppRequest_HandleRequest");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (p_pURLComponents->stAppName.iLength<=0
|
||||
|| !p_pURLComponents->stAppName.pszStart)
|
||||
{
|
||||
pHTTPResponse=GSWHTTPResponse_BuildErrorResponse(NULL,"No Application Name",p_pLogServerData);
|
||||
}
|
||||
else
|
||||
{
|
||||
char szAppName[MAXPATHLEN+1]="";
|
||||
char szHost[MAXHOSTNAMELEN+1]="";
|
||||
GSWAppRequest stAppRequest;
|
||||
memset(&stAppRequest,0,sizeof(stAppRequest));
|
||||
|
||||
GSWLog(GSW_DEBUG,p_pLogServerData,"Copy AppName");
|
||||
// Get App Name
|
||||
strncpy(szAppName,
|
||||
p_pURLComponents->stAppName.pszStart,
|
||||
p_pURLComponents->stAppName.iLength);
|
||||
szAppName[p_pURLComponents->stAppName.iLength]=0;
|
||||
|
||||
DeleteTrailingSlash(szAppName);
|
||||
if (strcmp(szAppName,p_pszTestAppName)==0)
|
||||
pHTTPResponse=GSWHTTPResponse_BuildStatusResponse(*p_ppHTTPRequest,p_pLogServerData);
|
||||
else
|
||||
{
|
||||
GSWLog(GSW_DEBUG,p_pLogServerData,"Get HostByName");
|
||||
// Get Host Name
|
||||
if (p_pURLComponents->stAppHost.iLength>0 && p_pURLComponents->stAppHost.pszStart)
|
||||
{
|
||||
strncpy(szHost,
|
||||
p_pURLComponents->stAppHost.pszStart,
|
||||
p_pURLComponents->stAppHost.iLength);
|
||||
szHost[p_pURLComponents->stAppHost.iLength] = '\0';
|
||||
};
|
||||
|
||||
// Get Request Instance Number
|
||||
GSWLog(GSW_DEBUG,p_pLogServerData,"Get Request Instance Number");
|
||||
|
||||
// in URL ?
|
||||
if (p_pURLComponents->stAppNumber.iLength>0 && p_pURLComponents->stAppNumber.pszStart)
|
||||
stAppRequest.iInstance = atoi(p_pURLComponents->stAppNumber.pszStart);
|
||||
|
||||
// In Cookie ?
|
||||
else
|
||||
{
|
||||
CONST char* pszCookie=GSWHTTPRequest_HeaderForKey(*p_ppHTTPRequest,g_szHeader_Cookie);
|
||||
if (pszCookie)
|
||||
{
|
||||
CONST char* pszInstanceCookie=strstr(pszCookie, g_szGSWeb_InstanceCookie);
|
||||
if (pszInstanceCookie)
|
||||
{
|
||||
stAppRequest.iInstance = atoi(pszInstanceCookie + strlen(g_szGSWeb_InstanceCookie));
|
||||
GSWLog(GSW_INFO,p_pLogServerData,"Cookie instance %d from %s",
|
||||
stAppRequest.iInstance,
|
||||
pszCookie);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
stAppRequest.pszName = szAppName;
|
||||
stAppRequest.pszHost = szHost;
|
||||
stAppRequest.pszDocRoot = p_pszDocRoot;
|
||||
stAppRequest.pRequest = *p_ppHTTPRequest;
|
||||
stAppRequest.uURLVersion = (p_pURLComponents->stVersion.pszStart) ?
|
||||
atoi(p_pURLComponents->stVersion.pszStart) : GSWEB_VERSION_MAJOR;
|
||||
|
||||
GSWLog(GSW_DEBUG,p_pLogServerData,"Add Header");
|
||||
GSWHTTPRequest_AddHeader(*p_ppHTTPRequest,
|
||||
g_szHeader_GSWeb_ServerAdaptor,
|
||||
g_szGSWeb_ServerAndAdaptorVersion);
|
||||
GSWLog(GSW_DEBUG,p_pLogServerData,"SendAppRequestToApp");
|
||||
pHTTPResponse=GSWAppRequest_SendAppRequestToApp(p_ppHTTPRequest,
|
||||
p_pURLComponents,
|
||||
&stAppRequest,
|
||||
p_pszHTTPVersion,
|
||||
p_pLogServerData);
|
||||
};
|
||||
};
|
||||
};
|
||||
GSWLog(GSW_DEBUG,p_pLogServerData,"Stop GSWAppRequest_HandleRequest");
|
||||
return pHTTPResponse;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue