diff --git a/INSTALL b/INSTALL index 3c9ceca..63d5a28 100644 --- a/INSTALL +++ b/INSTALL @@ -11,7 +11,7 @@ Chinese language: http://www.fastken.com/ # command lines as: git clone https://github.com/happyfish100/libfastcommon.git - cd libfastcommon; git checkout V1.0.67 + cd libfastcommon; git checkout V1.0.70 ./make.sh clean && ./make.sh && ./make.sh install @@ -21,7 +21,7 @@ Chinese language: http://www.fastken.com/ # command lines as: git clone https://github.com/happyfish100/libserverframe.git - cd libserverframe; git checkout V1.1.26 + cd libserverframe; git checkout V1.2.0 ./make.sh clean && ./make.sh && ./make.sh install # step 3. download fastdfs source codes and install it, @@ -30,7 +30,7 @@ Chinese language: http://www.fastken.com/ # command lines as: git clone https://github.com/happyfish100/fastdfs.git - cd fastdfs; git checkout V6.9.5 + cd fastdfs; git checkout V6.10.0 ./make.sh clean && ./make.sh && ./make.sh install diff --git a/common/fdfs_global.c b/common/fdfs_global.c index 155edb9..dfd7cc0 100644 --- a/common/fdfs_global.c +++ b/common/fdfs_global.c @@ -20,7 +20,7 @@ #include "fastcommon/logger.h" #include "fdfs_global.h" -Version g_fdfs_version = {6, 9, 5}; +Version g_fdfs_version = {6, 10, 0}; bool g_use_connection_pool = false; ConnectionPool g_connection_pool; int g_connection_pool_max_idle_time = 3600; diff --git a/fastdfs.spec b/fastdfs.spec index f1f2049..e84bcd3 100644 --- a/fastdfs.spec +++ b/fastdfs.spec @@ -7,7 +7,7 @@ %define CommitVersion %(echo $COMMIT_VERSION) Name: %{FastDFS} -Version: 6.9.5 +Version: 6.10.0 Release: 1%{?dist} Summary: FastDFS server and client License: GPL @@ -18,14 +18,14 @@ Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id -BuildRequires: libserverframe-devel >= 1.1.26 +BuildRequires: libserverframe-devel >= 1.2.0 %description This package provides tracker & storage of fastdfs commit version: %{CommitVersion} %package -n %{FDFSServer} -Requires: libserverframe >= 1.1.26 +Requires: libserverframe >= 1.2.0 Requires: %{FDFSConfig} Summary: fastdfs tracker & storage @@ -34,7 +34,7 @@ Requires: %{FDFSClient} Summary: fastdfs tools %package -n %{FDFSClient} -Requires: libserverframe >= 1.1.26 +Requires: libserverframe >= 1.2.0 Requires: %{FDFSConfig} Summary: The client dynamic library of fastdfs diff --git a/storage/fdfs_storaged.c b/storage/fdfs_storaged.c index e2e5edc..e27c1a1 100644 --- a/storage/fdfs_storaged.c +++ b/storage/fdfs_storaged.c @@ -249,8 +249,8 @@ int main(int argc, char *argv[]) return result; } - if ((result=set_run_by(g_sf_global_vars.run_by_group, - g_sf_global_vars.run_by_user)) != 0) + if ((result=set_run_by(g_sf_global_vars.run_by.group, + g_sf_global_vars.run_by.user)) != 0) { logCrit("exit abnormally!\n"); log_destroy(); diff --git a/storage/storage_dump.c b/storage/storage_dump.c index 8ebe9e1..8be021b 100644 --- a/storage/storage_dump.c +++ b/storage/storage_dump.c @@ -150,8 +150,8 @@ static int fdfs_dump_global_vars(char *buff, const int buffSize) , g_last_server_port , g_last_http_port , g_allow_ip_count - , g_sf_global_vars.run_by_group - , g_sf_global_vars.run_by_user + , g_sf_global_vars.run_by.group + , g_sf_global_vars.run_by.user , g_http_domain , g_file_distribute_path_mode , g_file_distribute_rotate_count diff --git a/tracker/fdfs_trackerd.c b/tracker/fdfs_trackerd.c index dab78e3..19701ea 100644 --- a/tracker/fdfs_trackerd.c +++ b/tracker/fdfs_trackerd.c @@ -289,8 +289,8 @@ int main(int argc, char *argv[]) } #endif - if ((result=set_run_by(g_sf_global_vars.run_by_group, - g_sf_global_vars.run_by_user)) != 0) + if ((result=set_run_by(g_sf_global_vars.run_by.group, + g_sf_global_vars.run_by.user)) != 0) { logCrit("exit abnormally!\n"); log_destroy(); diff --git a/tracker/tracker_dump.c b/tracker/tracker_dump.c index c8b152b..a4eeabd 100644 --- a/tracker/tracker_dump.c +++ b/tracker/tracker_dump.c @@ -361,8 +361,8 @@ static int fdfs_dump_global_vars(char *buff, const int buffSize) , fdfs_storage_reserved_space_to_string( \ &g_storage_reserved_space, reserved_space_str) \ , g_allow_ip_count - , g_sf_global_vars.run_by_group - , g_sf_global_vars.run_by_user + , g_sf_global_vars.run_by.group + , g_sf_global_vars.run_by.user , g_storage_ip_changed_auto_adjust , SF_G_THREAD_STACK_SIZE , g_if_use_trunk_file