GithubStar/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-10-29 11:36:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

update upstream manager

Browse Source
This commit is contained in:
XieHan
2021-11-19 23:52:42 +08:00
parent e541361e11
commit 01cd87ea9e
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/UpstreamManager.cc
+18 -5
View File
@@ -17,6 +17,7 @@
*/
#include <pthread.h>
#include <functional>
#include "UpstreamManager.h"
#include "WFNameService.h"
#include "WFGlobal.h"
@@ -60,15 +61,27 @@ private:
std::vector<std::string> upstream_names;
};
static unsigned int __default_consistent_hash(const char *path,
const char *query,
const char *fragment)
{
static std::hash<std::string> std_hash;
std::string str(path);
str += query;
str += fragment;
return std_hash(str);
}
int UpstreamManager::upstream_create_consistent_hash(const std::string& name,
upstream_route_t consistent_hash)
{
auto *ns = WFGlobal::get_name_service();
UPSConsistentHashPolicy *policy;
policy = new UPSConsistentHashPolicy(
consistent_hash ? std::move(consistent_hash) :
UpstreamManager::default_consistent_hash);
consistent_hash ? std::move(consistent_hash) :
__default_consistent_hash);
if (ns->add_policy(name.c_str(), policy) >= 0)
{
__UpstreamManager::get_instance()->add_policy_name(name);
@@ -119,8 +132,8 @@ int UpstreamManager::upstream_create_manual(const std::string& name,
UPSManualPolicy *policy;
policy = new UPSManualPolicy(try_another, std::move(select),
consistent_hash ? std::move(consistent_hash) :
UpstreamManager::default_consistent_hash);
consistent_hash ? std::move(consistent_hash) :
__default_consistent_hash);
if (ns->add_policy(name.c_str(), policy) >= 0)
{
__UpstreamManager::get_instance()->add_policy_name(name);
src/manager/UpstreamManager.h
-13
View File
@@ -21,7 +21,6 @@
#include <string>
#include <vector>
#include <functional>
#include "WFServiceGovernance.h"
#include "UpstreamPolicies.h"
#include "WFGlobal.h"
@@ -202,18 +201,6 @@ public:
const std::string& address,
const struct AddressParams *address_params);
private:
static unsigned int default_consistent_hash(const char *path,
const char *query,
const char *fragment)
{
static std::hash<std::string> std_hash;
std::string str(path);
str += query;
str += fragment;
return std_hash(str);
}
};
#endif