upgrade version to 1.2.15

libserverframe.spec

@@ -2,7 +2,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: libserverframe
-Version: 1.2.14
+Version: 1.2.15
 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.86
+BuildRequires: libfastcommon-devel >= 1.0.88
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
-Requires: libfastcommon >= 1.0.86
+Requires: libfastcommon >= 1.0.88
 
 %description
 common framework library 

src/sf_global.c

@@ -161,9 +161,9 @@ int sf_load_log_config(IniFullContext *ini_ctx, LogContext *log_ctx,
 {
     int result;
 
-    log_cfg->sync_log_buff_interval = iniGetIntValueEx(
+    log_cfg->sync_log_buff_interval = iniGetTimestampValueEx(
             ini_ctx->section_name, "sync_log_buff_interval",
-            ini_ctx->context, SF_DEF_SYNC_LOG_BUFF_INTERVAL, true);
+            ini_ctx->context, SF_DEF_SYNC_LOG_BUFF_INTERVAL, 1, true);
     if (log_cfg->sync_log_buff_interval <= 0) {
         log_cfg->sync_log_buff_interval = SF_DEF_SYNC_LOG_BUFF_INTERVAL;
     }

src/sf_util.c

@@ -95,7 +95,7 @@ int sf_printbuffer(char* buffer,int32_t len)
 void sf_usage_ex(const char *program, const SFCMDOption *other_options)
 {
     fprintf(stderr, "\nUsage: %s [options] <config_file> "
-            "[start | stop | restart | status]\n\noptions:\n", program);
+            "[start | stop | restart | status]\n\nOptions:\n", program);
 
     if (other_options != NULL) {
         const SFCMDOption *option;

src/sf_version.h

@@ -22,7 +22,7 @@
 
 #define SF_MAJOR_VERSION   1
 #define SF_MINOR_VERSION   2
-#define SF_PATCH_VERSION  14
+#define SF_PATCH_VERSION  15
 
 #define SF_VERSION_INT  FC_VERSION_TO_INT(SF_MAJOR_VERSION, \
         SF_MINOR_VERSION, SF_PATCH_VERSION)