gfwleak/doris-doris-dispatch
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持https；适应版本跳跃；增加md5校验；

Browse Source
This commit is contained in:
linuxrc@163.com
2021-07-19 17:21:38 +08:00
parent 26b1a08500
commit 16a47fc07f
12 changed files with 291 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/doris_server_main.cpp
View File

@@ -16,8 +16,8 @@
#include "doris_server_main.h"
#include "doris_server_http.h"
struct nirvana_global_info g_doris_server_info;
static unsigned long doris_vesion_20210716=20210716L;
struct doris_global_info g_doris_server_info;
static unsigned long doris_vesion_20210719=20210719L;
int doris_mkdir_according_path(const char * path)
{
@@ -65,10 +65,10 @@ int32_t doris_read_profile_configs(const char *config_file)
snprintf(tmp_dir, 256, "%s/runtime_log", g_doris_server_info.root_log_dir);
if(doris_mkdir_according_path(tmp_dir))
{
printf("mkdir %s for duran runtimelog failed: %s\n", tmp_dir, strerror(errno));
printf("mkdir %s for runtimelog failed: %s\n", tmp_dir, strerror(errno));
return -1;
}
snprintf(tmp_buf, 256, "%s/nirvana_runtime.log", tmp_dir);
snprintf(tmp_buf, 256, "%s/doris_runtime.log", tmp_dir);
g_doris_server_info.log_runtime = MESA_create_runtime_log_handle(tmp_buf, g_doris_server_info.log_level);
if(NULL==g_doris_server_info.log_runtime)
{
@@ -117,7 +117,7 @@ int32_t doris_read_profile_configs(const char *config_file)
MESA_load_profile_uint_def(config_file, "DORIS_SERVER", "scan_index_file_interval", &g_doris_server_info.scan_idx_interval, 10);
}
MESA_load_profile_uint_def(config_file, "DORIS_SERVER", "ssl_tcp_connection_on", &g_doris_server_info.ssl_conn_on, 0);
MESA_load_profile_uint_def(config_file, "DORIS_SERVER", "https_connection_on", &g_doris_server_info.ssl_conn_on, 0);
if(g_doris_server_info.ssl_conn_on)
{
MESA_load_profile_string_def(config_file, "DORIS_SERVER", "ssl_trusted_ca_path", g_doris_server_info.ssl_CA_path, 256, "./conf/ssl_CA_path/");
@@ -128,7 +128,7 @@ int32_t doris_read_profile_configs(const char *config_file)
/*FiledStat*/
MESA_load_profile_string_def(config_file, "DORIS_SERVER", "fsstat_log_appname", g_doris_server_info.fsstat_appname, 16, "DORIS_SERVER_S");
MESA_load_profile_string_def(config_file, "DORIS_SERVER", "fsstat_log_filepath", g_doris_server_info.fsstat_filepath, 256, "./log/nirvana_server.fs");
MESA_load_profile_string_def(config_file, "DORIS_SERVER", "fsstat_log_filepath", g_doris_server_info.fsstat_filepath, 256, "./log/doris_server.fs");
MESA_load_profile_uint_def(config_file, "DORIS_SERVER", "fsstat_log_interval", &g_doris_server_info.fsstat_period, 10);
MESA_load_profile_int_def(config_file, "DORIS_SERVER", "fsstat_log_print_mode", &g_doris_server_info.fsstat_print_mode, 1);
MESA_load_profile_string_def(config_file, "DORIS_SERVER", "fsstat_log_dst_ip", g_doris_server_info.fsstat_dst_ip, 64, "127.0.0.1");
@@ -141,7 +141,7 @@ int32_t doris_read_profile_configs(const char *config_file)
return 0;
}
static int doris_server_register_field_stat(struct nirvana_global_info *param)
static int doris_server_register_field_stat(struct doris_global_info *param)
{
const char *field_names[DRS_FSSTAT_FIELD_NUM]={"RecvFullVer", "RecvIncVer", "RecvErrVer", "FileStarts", "FileComplete",
"ClientInvReq", "ClientMetaReq", "SendResMeta", "SendNoNewMeta", "ClientFileReq", "SendFiles", "SendBytes", "SendFile404"};
@@ -263,7 +263,7 @@ int main(int argc, char **argv)
evhttp_set_cb(manager_http, "/doris/statistic/status", manager_statistic_status_requests_cb, NULL);
evhttp_set_cb(manager_http, "/doris/statistic/threads", manager_statistic_threads_requests_cb, NULL);
evhttp_set_gencb(manager_http, manager_generic_requests_cb, NULL);
g_doris_server_info.monitor = MESA_Monitor_instance_evhttp_new(manager_http, doris_vesion_20210716);
g_doris_server_info.monitor = MESA_Monitor_instance_evhttp_new(manager_http, doris_vesion_20210719);
g_doris_server_info.mm_latest_ver = MESA_Monitor_register(g_doris_server_info.monitor, "latest_cfg_version", MONITOR_METRICS_GAUGE, "Latest doris config version.");
g_doris_server_info.mm_total_cfgnum = MESA_Monitor_register(g_doris_server_info.monitor, "total_config_num", MONITOR_METRICS_GAUGE, "Total config num from latest full version till now.");