From 6a60a49c32aa645b98324b1886a4734787b766a7 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Tue, 17 Sep 2024 11:24:01 +0800 Subject: [PATCH] upgrade version to 1.2.5 --- libserverframe.spec | 6 +++--- src/sf_connection_manager.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libserverframe.spec b/libserverframe.spec index 5c419df..7f5282c 100644 --- a/libserverframe.spec +++ b/libserverframe.spec @@ -2,7 +2,7 @@ %define CommitVersion %(echo $COMMIT_VERSION) Name: libserverframe -Version: 1.2.4 +Version: 1.2.5 Release: 1%{?dist} Summary: network framework library License: AGPL v3.0 @@ -12,9 +12,9 @@ Source: http://github.com/happyfish100/libserverframe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libfastcommon-devel >= 1.0.74 +BuildRequires: libfastcommon-devel >= 1.0.75 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id -Requires: libfastcommon >= 1.0.74 +Requires: libfastcommon >= 1.0.75 %description common framework library diff --git a/src/sf_connection_manager.c b/src/sf_connection_manager.c index 7981d8d..0e28323 100644 --- a/src/sf_connection_manager.c +++ b/src/sf_connection_manager.c @@ -176,7 +176,7 @@ static inline bool alive_array_cas(SFConnectionManager *cm, push_to_detect_queue(cm, group, new_alives); fast_mblock_delay_free_object(&cm->sptr_array_allocator, old_alives, (cm->common_cfg->connect_timeout + cm->common_cfg-> - network_timeout) * group->all.count); + network_timeout) * group->all.count * 4); return true; } else { fast_mblock_free_object(&cm->sptr_array_allocator, new_alives);