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

fdfs_storaged.c: advance the position of daemon_init

pull/48/head^2
yuqing 2015-08-15 10:43:46 +08:00
parent f46f8bfb0b
commit 2b5d703542
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -1,8 +1,10 @@
Version 5.07 2015-08-14 Version 5.07 2015-08-15
* schedule task add the "second" field * schedule task add the "second" field
* make.sh changed, you must upgrade libfastcommon to V1.20 or later * make.sh changed, you must upgrade libfastcommon to V1.20 or later
* bug fixed: storage_disk_recovery.c skip the first file (binlog first line) * bug fixed: storage_disk_recovery.c skip the first file (binlog first line)
* bug fixed: should close connection after fetch binlog
* fdfs_storaged.c: advance the position of daemon_init
Version 5.06 2015-05-12 Version 5.06 2015-05-12
* compile passed in mac OS Darwin * compile passed in mac OS Darwin

5
storage/fdfs_storaged.c
View File

@ -144,6 +144,9 @@ int main(int argc, char *argv[])
} }
#endif #endif
daemon_init(false);
umask(0);
memset(g_bind_addr, 0, sizeof(g_bind_addr)); memset(g_bind_addr, 0, sizeof(g_bind_addr));
if ((result=storage_func_init(conf_filename, \ if ((result=storage_func_init(conf_filename, \
g_bind_addr, sizeof(g_bind_addr))) != 0) g_bind_addr, sizeof(g_bind_addr))) != 0)
@ -168,8 +171,6 @@ int main(int argc, char *argv[])
return result; return result;
} }
daemon_init(false);
umask(0);
if ((result=write_to_pid_file(pidFilename)) != 0) if ((result=write_to_pid_file(pidFilename)) != 0)
{ {
log_destroy(); log_destroy();

2
storage/storage_disk_recovery.c
View File

@ -1117,7 +1117,7 @@ int storage_disk_recovery_start(const int store_path_index)
} }
result = storage_do_fetch_binlog(pStorageConn, store_path_index); result = storage_do_fetch_binlog(pStorageConn, store_path_index);
tracker_disconnect_server(pStorageConn, true); tracker_disconnect_server_ex(pStorageConn, true);
if (result != 0) if (result != 0)
{ {
return result; return result;