From a9ebe20b5b7b3ac0f78b0b8b27e8059b6defa4ff Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Wed, 15 Feb 2023 21:04:04 +0800
Subject: [PATCH] upgrade version to 1.1.25

---
 libserverframe.spec |  6 +++---
 src/sf_nio.c        | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/libserverframe.spec b/libserverframe.spec
index 20cd9a7..5cc3a93 100644
--- a/libserverframe.spec
+++ b/libserverframe.spec
@@ -2,7 +2,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: libserverframe
-Version: 1.1.24
+Version: 1.1.25
 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.65
+BuildRequires: libfastcommon-devel >= 1.0.66
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
-Requires: libfastcommon >= 1.0.65
+Requires: libfastcommon >= 1.0.66
 
 %description
 common framework library 
diff --git a/src/sf_nio.c b/src/sf_nio.c
index e2c8728..67fd9d4 100644
--- a/src/sf_nio.c
+++ b/src/sf_nio.c
@@ -581,10 +581,9 @@ int sf_client_sock_read(int sock, short event, void *arg)
             if (task->offset > 0) {
                 if (task->length > 0) {
                     logWarning("file: "__FILE__", line: %d, "
-                            "client ip: %s, connection "
-                            "disconnected, expect pkg length: %d, "
-                            "recv pkg length: %d", __LINE__,
-                            task->client_ip, task->length,
+                            "client ip: %s, connection disconnected, "
+                            "expect pkg length: %d, recv pkg length: %d",
+                            __LINE__, task->client_ip, task->length,
                             task->offset);
                 } else {
                     logWarning("file: "__FILE__", line: %d, "
@@ -596,8 +595,8 @@ int sf_client_sock_read(int sock, short event, void *arg)
             } else {
                 logDebug("file: "__FILE__", line: %d, "
                         "client ip: %s, sock: %d, recv fail, "
-                        "connection disconnected",
-                        __LINE__, task->client_ip, sock);
+                        "connection disconnected", __LINE__,
+                        task->client_ip, sock);
             }
 
             ioevent_add_to_deleted_list(task);