From 565355063312c14f30f15123a625c18e746da964 Mon Sep 17 00:00:00 2001
From: hush-soul <275040673@qq.com>
Date: Wed, 17 Jul 2024 14:18:13 +0800
Subject: [PATCH 1/4] Update dlt_offline_logstorage.c

---
 src/offlinelogstorage/dlt_offline_logstorage.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/offlinelogstorage/dlt_offline_logstorage.c b/src/offlinelogstorage/dlt_offline_logstorage.c
index e65436cae..8b407a9bf 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage.c
+++ b/src/offlinelogstorage/dlt_offline_logstorage.c
@@ -80,14 +80,16 @@ DLT_STATIC void dlt_logstorage_filter_config_free(DltLogStorageFilterConfig *dat
         data->ecuid = NULL;
     }
 
-    if (data->log != NULL)
-        fclose(data->log);
+
 
 #ifdef DLT_LOGSTORAGE_USE_GZIP
     if (data->gzlog != NULL)
         gzclose(data->gzlog);
 #endif
 
+        if (data->log != NULL)
+        fclose(data->log);
+    
     if (data->cache != NULL) {
         free(data->cache);
         data->cache = NULL;

From 1124dd9359577c42170de6d73295827879ac3f6f Mon Sep 17 00:00:00 2001
From: hush-soul <275040673@qq.com>
Date: Wed, 17 Jul 2024 14:23:43 +0800
Subject: [PATCH 2/4] Update dlt_offline_logstorage_behavior.c

---
 .../dlt_offline_logstorage_behavior.c              | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
index fb9c95f2f..5ee25e67a 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
+++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
@@ -371,6 +371,14 @@ int dlt_logstorage_storage_dir_info(DltLogStorageUserConfig *file_config,
     }
 
     char* suffix = NULL;
+        
+    if (config->gzip_compression) {
+            suffix = strdup(".dlt.gz");
+        }
+        else {
+            suffix = strdup(".dlt");
+        }
+    
     for (i = 0; i < cnt; i++) {
         if (config->gzip_compression) {
             suffix = strdup(".dlt.gz");
@@ -501,6 +509,7 @@ DLT_STATIC void dlt_logstorage_open_log_output_file(DltLogStorageFilterConfig *c
 #ifdef DLT_LOGSTORAGE_USE_GZIP
         dlt_vlog(LOG_DEBUG, "%s: Opening GZIP log file\n", __func__);
         config->gzlog = gzdopen(config->fd, mode);
+        config->log = file;
 #endif
     } else {
         dlt_vlog(LOG_DEBUG, "%s: Opening log file\n", __func__);
@@ -912,6 +921,11 @@ DLT_STATIC void dlt_logstorage_close_file(DltLogStorageFilterConfig *config)
         gzclose(config->gzlog);
         config->gzlog = NULL;
     }
+    
+    if (config->log) {
+        fclose(config->log);
+        config->log = NULL;
+    }
 #endif
     if (config->log) {
         fclose(config->log);

From f80373d1ffbb1214ab9f21570c9b2b899536eb5e Mon Sep 17 00:00:00 2001
From: hush-soul <275040673@qq.com>
Date: Wed, 17 Jul 2024 14:25:42 +0800
Subject: [PATCH 3/4] Update dlt_offline_logstorage_behavior.c

---
 src/offlinelogstorage/dlt_offline_logstorage_behavior.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
index 5ee25e67a..61231df56 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
+++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
@@ -380,12 +380,6 @@ int dlt_logstorage_storage_dir_info(DltLogStorageUserConfig *file_config,
         }
     
     for (i = 0; i < cnt; i++) {
-        if (config->gzip_compression) {
-            suffix = strdup(".dlt.gz");
-        }
-        else {
-            suffix = strdup(".dlt");
-        }
 
         int len = 0;
         len = strlen(file_name);

From 208c99e39f5332bded83ef7a75ab1bfde707e71c Mon Sep 17 00:00:00 2001
From: hush-soul <275040673@qq.com>
Date: Wed, 17 Jul 2024 18:12:13 +0800
Subject: [PATCH 4/4] Update dlt_offline_logstorage_behavior.c

---
 src/offlinelogstorage/dlt_offline_logstorage_behavior.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
index 61231df56..005984b58 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
+++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
@@ -915,11 +915,6 @@ DLT_STATIC void dlt_logstorage_close_file(DltLogStorageFilterConfig *config)
         gzclose(config->gzlog);
         config->gzlog = NULL;
     }
-    
-    if (config->log) {
-        fclose(config->log);
-        config->log = NULL;
-    }
 #endif
     if (config->log) {
         fclose(config->log);