From 8de3678e863529470865fd3d5348f93a09c8e047 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Thu, 3 Mar 2022 10:00:29 +0800
Subject: [PATCH] sf_load_global_config_ex: server_name can be NULL

---
 src/sf_global.c  | 10 ++++++----
 src/sf_service.c |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/sf_global.c b/src/sf_global.c
index a3d4bb1..dc3c819 100644
--- a/src/sf_global.c
+++ b/src/sf_global.c
@@ -352,15 +352,17 @@ int sf_load_global_config_ex(const char *server_name,
     ini_ctx->section_name = old_section_name;
 
     load_log_level(ini_ctx->context);
-    if ((result=log_set_prefix(SF_G_BASE_PATH_STR, server_name)) != 0) {
-        return result;
+    if (server_name != NULL) {
+        if ((result=log_set_prefix(SF_G_BASE_PATH_STR, server_name)) != 0) {
+            return result;
+        }
     }
 
     return 0;
 }
 
-int sf_load_config_ex(const char *server_name,
-        SFContextIniConfig *config, const int task_buffer_extra_size)
+int sf_load_config_ex(const char *server_name, SFContextIniConfig
+        *config, const int task_buffer_extra_size)
 {
     int result;
     if ((result=sf_load_global_config_ex(server_name, &config->ini_ctx,
diff --git a/src/sf_service.c b/src/sf_service.c
index 212e91a..a0ac841 100644
--- a/src/sf_service.c
+++ b/src/sf_service.c
@@ -169,6 +169,7 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
         return ENOMEM;
     }
 
+    g_current_time = time(NULL);
     sf_context->thread_count = 0;
     data_end = sf_context->thread_data + sf_context->work_threads;
     for (thread_data=sf_context->thread_data,thread_ctx=thread_contexts;
@@ -198,9 +199,8 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
                 2 * g_sf_global_vars.network_timeout, g_current_time);
         if (result != 0) {
             logError("file: "__FILE__", line: %d, "
-                "fast_timer_init fail, "
-                "errno: %d, error info: %s",
-                __LINE__, result, strerror(result));
+                    "fast_timer_init fail, errno: %d, error info: %s",
+                    __LINE__, result, strerror(result));
             return result;
         }