pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use int_to_comma_str to show buff size

pull/252/head
yuqing 2018-06-29 10:48:30 +08:00
parent af143b8d54
commit 99526a2523
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/storage_func.c
View File

@ -1777,7 +1777,7 @@ int storage_func_init(const char *filename, \
"work_threads=%d, " \ "work_threads=%d, " \
"disk_rw_separated=%d, disk_reader_threads=%d, " \ "disk_rw_separated=%d, disk_reader_threads=%d, " \
"disk_writer_threads=%d, " \ "disk_writer_threads=%d, " \
"buff_size=%dKB, heart_beat_interval=%ds, " \ "buff_size=%d KB, heart_beat_interval=%ds, " \
"stat_report_interval=%ds, tracker_server_count=%d, " \ "stat_report_interval=%ds, tracker_server_count=%d, " \
"sync_wait_msec=%dms, sync_interval=%dms, " \ "sync_wait_msec=%dms, sync_interval=%dms, " \
"sync_start_time=%02d:%02d, sync_end_time=%02d:%02d, "\ "sync_start_time=%02d:%02d, sync_end_time=%02d:%02d, "\

11
tracker/tracker_func.c
View File

@ -151,6 +151,8 @@ int tracker_load_from_conf_file(const char *filename, \
int64_t rotate_error_log_size; int64_t rotate_error_log_size;
int64_t min_buff_size; int64_t min_buff_size;
int64_t max_buff_size; int64_t max_buff_size;
char sz_min_buff_size[32];
char sz_max_buff_size[32];
char reserved_space_str[32]; char reserved_space_str[32];
memset(&g_groups, 0, sizeof(FDFSGroups)); memset(&g_groups, 0, sizeof(FDFSGroups));
@ -703,6 +705,9 @@ int tracker_load_from_conf_file(const char *filename, \
g_groups.store_server = FDFS_STORE_SERVER_FIRST_BY_IP; g_groups.store_server = FDFS_STORE_SERVER_FIRST_BY_IP;
} }
int_to_comma_str(g_min_buff_size, sz_min_buff_size);
int_to_comma_str(g_max_buff_size, sz_max_buff_size);
logInfo("FastDFS v%d.%02d, base_path=%s, " \ logInfo("FastDFS v%d.%02d, base_path=%s, " \
"run_by_group=%s, run_by_user=%s, " \ "run_by_group=%s, run_by_user=%s, " \
"connect_timeout=%ds, " \ "connect_timeout=%ds, " \
@ -711,8 +716,8 @@ int tracker_load_from_conf_file(const char *filename, \
"max_connections=%d, " \ "max_connections=%d, " \
"accept_threads=%d, " \ "accept_threads=%d, " \
"work_threads=%d, " \ "work_threads=%d, " \
"min_buff_size=%d, " \ "min_buff_size=%s, " \
"max_buff_size=%d, " \ "max_buff_size=%s, " \
"store_lookup=%d, store_group=%s, " \ "store_lookup=%d, store_group=%s, " \
"store_server=%d, store_path=%d, " \ "store_server=%d, store_path=%d, " \
"reserved_storage_space=%s, " \ "reserved_storage_space=%s, " \
@ -749,7 +754,7 @@ int tracker_load_from_conf_file(const char *filename, \
g_fdfs_connect_timeout, \ g_fdfs_connect_timeout, \
g_fdfs_network_timeout, g_server_port, bind_addr, \ g_fdfs_network_timeout, g_server_port, bind_addr, \
g_max_connections, g_accept_threads, g_work_threads, \ g_max_connections, g_accept_threads, g_work_threads, \
g_min_buff_size, g_max_buff_size, \ sz_min_buff_size, sz_max_buff_size, \
g_groups.store_lookup, g_groups.store_group, \ g_groups.store_lookup, g_groups.store_group, \
g_groups.store_server, g_groups.store_path, \ g_groups.store_server, g_groups.store_path, \
fdfs_storage_reserved_space_to_string( \ fdfs_storage_reserved_space_to_string( \