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

upgrade version to 6.10.0

use_libfastcommon1.70
YuQing 2023-10-24 10:22:46 +08:00
parent 2b111d9568
commit 64e0a536dc
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL
View File

@ -11,7 +11,7 @@ Chinese language: http://www.fastken.com/
# command lines as: # command lines as:
git clone https://github.com/happyfish100/libfastcommon.git 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 ./make.sh clean && ./make.sh && ./make.sh install
@ -21,7 +21,7 @@ Chinese language: http://www.fastken.com/
# command lines as: # command lines as:
git clone https://github.com/happyfish100/libserverframe.git 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 ./make.sh clean && ./make.sh && ./make.sh install
# step 3. download fastdfs source codes and install it, # step 3. download fastdfs source codes and install it,
@ -30,7 +30,7 @@ Chinese language: http://www.fastken.com/
# command lines as: # command lines as:
git clone https://github.com/happyfish100/fastdfs.git 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 ./make.sh clean && ./make.sh && ./make.sh install

2
common/fdfs_global.c
View File

@ -20,7 +20,7 @@
#include "fastcommon/logger.h" #include "fastcommon/logger.h"
#include "fdfs_global.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; bool g_use_connection_pool = false;
ConnectionPool g_connection_pool; ConnectionPool g_connection_pool;
int g_connection_pool_max_idle_time = 3600; int g_connection_pool_max_idle_time = 3600;

8
fastdfs.spec
View File

@ -7,7 +7,7 @@
%define CommitVersion %(echo $COMMIT_VERSION) %define CommitVersion %(echo $COMMIT_VERSION)
Name: %{FastDFS} Name: %{FastDFS}
Version: 6.9.5 Version: 6.10.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: FastDFS server and client Summary: FastDFS server and client
License: GPL 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
BuildRequires: libserverframe-devel >= 1.1.26 BuildRequires: libserverframe-devel >= 1.2.0
%description %description
This package provides tracker & storage of fastdfs This package provides tracker & storage of fastdfs
commit version: %{CommitVersion} commit version: %{CommitVersion}
%package -n %{FDFSServer} %package -n %{FDFSServer}
Requires: libserverframe >= 1.1.26 Requires: libserverframe >= 1.2.0
Requires: %{FDFSConfig} Requires: %{FDFSConfig}
Summary: fastdfs tracker & storage Summary: fastdfs tracker & storage
@ -34,7 +34,7 @@ Requires: %{FDFSClient}
Summary: fastdfs tools Summary: fastdfs tools
%package -n %{FDFSClient} %package -n %{FDFSClient}
Requires: libserverframe >= 1.1.26 Requires: libserverframe >= 1.2.0
Requires: %{FDFSConfig} Requires: %{FDFSConfig}
Summary: The client dynamic library of fastdfs Summary: The client dynamic library of fastdfs

4
storage/fdfs_storaged.c
View File

@ -249,8 +249,8 @@ int main(int argc, char *argv[])
return result; return result;
} }
if ((result=set_run_by(g_sf_global_vars.run_by_group, if ((result=set_run_by(g_sf_global_vars.run_by.group,
g_sf_global_vars.run_by_user)) != 0) g_sf_global_vars.run_by.user)) != 0)
{ {
logCrit("exit abnormally!\n"); logCrit("exit abnormally!\n");
log_destroy(); log_destroy();

4
storage/storage_dump.c
View File

@ -150,8 +150,8 @@ static int fdfs_dump_global_vars(char *buff, const int buffSize)
, g_last_server_port , g_last_server_port
, g_last_http_port , g_last_http_port
, g_allow_ip_count , g_allow_ip_count
, g_sf_global_vars.run_by_group , g_sf_global_vars.run_by.group
, g_sf_global_vars.run_by_user , g_sf_global_vars.run_by.user
, g_http_domain , g_http_domain
, g_file_distribute_path_mode , g_file_distribute_path_mode
, g_file_distribute_rotate_count , g_file_distribute_rotate_count

4
tracker/fdfs_trackerd.c
View File

@ -289,8 +289,8 @@ int main(int argc, char *argv[])
} }
#endif #endif
if ((result=set_run_by(g_sf_global_vars.run_by_group, if ((result=set_run_by(g_sf_global_vars.run_by.group,
g_sf_global_vars.run_by_user)) != 0) g_sf_global_vars.run_by.user)) != 0)
{ {
logCrit("exit abnormally!\n"); logCrit("exit abnormally!\n");
log_destroy(); log_destroy();

4
tracker/tracker_dump.c
View File

@ -361,8 +361,8 @@ static int fdfs_dump_global_vars(char *buff, const int buffSize)
, fdfs_storage_reserved_space_to_string( \ , fdfs_storage_reserved_space_to_string( \
&g_storage_reserved_space, reserved_space_str) \ &g_storage_reserved_space, reserved_space_str) \
, g_allow_ip_count , g_allow_ip_count
, g_sf_global_vars.run_by_group , g_sf_global_vars.run_by.group
, g_sf_global_vars.run_by_user , g_sf_global_vars.run_by.user
, g_storage_ip_changed_auto_adjust , g_storage_ip_changed_auto_adjust
, SF_G_THREAD_STACK_SIZE , SF_G_THREAD_STACK_SIZE
, g_if_use_trunk_file , g_if_use_trunk_file