delete:center Distributed function,it is useless

Author: xengine-qyt

XEngine_Source/StorageModule_Config/Config_Define.h

@@ -127,21 +127,18 @@ typedef struct
 	bool bDistributed;
     struct  
     {
-        int nCenterMode;
         int nUPLoadMode;
         int nDownldMode;
         int nStorageMode;
     }st_LBDistributed;
 	struct
 	{
-		int nCenterMode;
 		int nUPLoadMode;
 		int nDownldMode;
 		int nStorageMode;
 	}st_LBLocation;
 	struct
 	{
-        list<string>* pStl_ListCenter;
 		list<string>* pStl_ListDownload;
 		list<string>* pStl_ListUPLoader;
         list<XENGINE_STORAGEBUCKET>* pStl_ListBucket;

XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp

@@ -296,44 +296,36 @@ bool CConfig_Json::Config_Json_LoadBalance(LPCXSTR lpszConfigFile, XENGINE_LBCON
 	}
 	pSt_ServerConfig->bDistributed = st_JsonRoot["bDistributed"].asInt();
 
-	if (st_JsonRoot["LBDistributed"].empty() || (4 != st_JsonRoot["LBDistributed"].size()))
+	if (st_JsonRoot["LBDistributed"].empty() || (3 != st_JsonRoot["LBDistributed"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_LBDISTRIBUTED;
 		return false;
 	}
 	Json::Value st_JsonLBDistributed = st_JsonRoot["LBDistributed"];
-	pSt_ServerConfig->st_LBDistributed.nCenterMode = st_JsonLBDistributed["nCenterMode"].asInt();
 	pSt_ServerConfig->st_LBDistributed.nUPLoadMode = st_JsonLBDistributed["nUPLoadMode"].asInt();
 	pSt_ServerConfig->st_LBDistributed.nDownldMode = st_JsonLBDistributed["nDownldMode"].asInt();
 	pSt_ServerConfig->st_LBDistributed.nStorageMode = st_JsonLBDistributed["nStorageMode"].asInt();
 
-	if (st_JsonRoot["LBLocation"].empty() || (4 != st_JsonRoot["LBLocation"].size()))
+	if (st_JsonRoot["LBLocation"].empty() || (3 != st_JsonRoot["LBLocation"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_LBLOCATION;
 		return false;
 	}
 	Json::Value st_JsonLBLocation = st_JsonRoot["LBLocation"];
-	pSt_ServerConfig->st_LBLocation.nCenterMode = st_JsonLBLocation["nCenterMode"].asInt();
 	pSt_ServerConfig->st_LBLocation.nUPLoadMode = st_JsonLBLocation["nUPLoadMode"].asInt();
 	pSt_ServerConfig->st_LBLocation.nDownldMode = st_JsonLBLocation["nDownldMode"].asInt();
 	pSt_ServerConfig->st_LBLocation.nStorageMode = st_JsonLBLocation["nStorageMode"].asInt();
 
-	if (st_JsonRoot["LoadBalance"].empty() || (4 != st_JsonRoot["LoadBalance"].size()))
+	if (st_JsonRoot["LoadBalance"].empty() || (3 != st_JsonRoot["LoadBalance"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_LAODBALANCE;
 		return false;
 	}
 	Json::Value st_JsonLoadBalance = st_JsonRoot["LoadBalance"];
 
-	pSt_ServerConfig->st_LoadBalance.pStl_ListCenter = new list<string>;
-	for (unsigned int i = 0; i < st_JsonLoadBalance["CenterAddr"].size(); i++)
-	{
-		pSt_ServerConfig->st_LoadBalance.pStl_ListCenter->push_back(st_JsonLoadBalance["CenterAddr"][i].asCString());
-	}
-
 	pSt_ServerConfig->st_LoadBalance.pStl_ListDownload = new list<string>;
 	for (unsigned int i = 0; i < st_JsonLoadBalance["DownloadAddr"].size(); i++)
 	{

XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp

@@ -116,27 +116,6 @@ bool XEngine_Task_HttpCenter(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 
 	if (0 == _tcsxnicmp(lpszMethodPost, pSt_HTTPParam->tszHttpMethod, _tcsxlen(lpszMethodPost)))
 	{
-		//使用重定向?
-		if (st_LoadbalanceCfg.st_LBDistributed.nCenterMode > 0)
-		{
-			XCHAR tszHdrBuffer[1024];
-			XCHAR tszStorageAddr[128];
-
-			memset(tszHdrBuffer, '\0', sizeof(tszHdrBuffer));
-			memset(tszStorageAddr, '\0', sizeof(tszStorageAddr));
-
-			st_HDRParam.bIsClose = true;
-			st_HDRParam.nHttpCode = 302;
-
-			APIHelp_Distributed_RandomAddr(st_LoadbalanceCfg.st_LoadBalance.pStl_ListCenter, tszStorageAddr, st_LoadbalanceCfg.st_LBDistributed.nCenterMode);
-			_xstprintf(tszHdrBuffer, _X("Location: %s%s\r\n"), tszStorageAddr, pSt_HTTPParam->tszHttpUri);
-
-			HttpProtocol_Server_SendMsgEx(xhDLHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, tszHdrBuffer);
-			XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("业务客户端:%s,请求的函数被要求重定向到:%s%s"), lpszClientAddr, tszStorageAddr, pSt_HTTPParam->tszHttpUri);
-			return true;
-		}
-
 		if (!HttpProtocol_ServerHelp_GetUrlApi(pSt_HTTPParam->tszHttpUri, tszAPIVersion, tszAPIMethod, tszAPIName))
 		{
 			st_HDRParam.bIsClose = true;

XEngine_Source/XEngine_StorageApp/StorageApp_Config.cpp

@@ -15,11 +15,6 @@ bool StorageApp_Config_Parament(int argc,char **argv)
 		delete st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket;
         st_LoadbalanceCfg.st_LoadBalance.pStl_ListBucket = NULL;
 	}
-	if (NULL != st_LoadbalanceCfg.st_LoadBalance.pStl_ListCenter)
-	{
-		delete st_LoadbalanceCfg.st_LoadBalance.pStl_ListCenter;
-        st_LoadbalanceCfg.st_LoadBalance.pStl_ListCenter = NULL;
-	}
 	if (NULL != st_LoadbalanceCfg.st_LoadBalance.pStl_ListDownload)
 	{
 		delete st_LoadbalanceCfg.st_LoadBalance.pStl_ListDownload;