Use new function GetLogDirectory()

diff --git a/src/alert-pcapinfo.c b/src/alert-pcapinfo.c
index e24296003f2a03f485ed962057e8e24dd85feb13..3f7abc6512d2385e75074272c4f3232ed62baaab 100644 (file)
--- a/src/alert-pcapinfo.c
+++ b/src/alert-pcapinfo.c
@@ -214,8 +214,7 @@ static int AlertPcapInfoOpenFileCtx(LogFileCtx *file_ctx, const char *filename,
     char log_path[PATH_MAX];
     char *log_dir;
 
-    if (ConfGet("default-log-dir", &log_dir) != 1)
-        log_dir = DEFAULT_LOG_DIR;
+    log_dir = GetLogDirectory();
 
     snprintf(log_path, PATH_MAX, "%s/%s", log_dir, filename);
 

diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index 4146f3928d313c76884139f920141bcc0ab76642..37326610671f24b757b0a598304d76fb3b73301f 100644 (file)
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -1096,8 +1096,7 @@ int Unified2AlertOpenFileCtx(LogFileCtx *file_ctx, const char *prefix)
 
     /* create the filename to use */
     char *log_dir;
-    if (ConfGet("default-log-dir", &log_dir) != 1)
-        log_dir = DEFAULT_LOG_DIR;
+    log_dir = GetLogDirectory();
 
     snprintf(filename, PATH_MAX, "%s/%s.%" PRIu32, log_dir, prefix, (uint32_t)ts.tv_sec);
 

diff --git a/src/counters.c b/src/counters.c
index b6b7df8d6a913a45c18b4bcb6e781e002ce5e911..50296fa84cf2e0dde0791452a23b8ea28badc815 100644 (file)
--- a/src/counters.c
+++ b/src/counters.c
@@ -277,8 +277,7 @@ static char *SCPerfGetLogFilename(ConfNode *stats)
     char *log_filename = NULL;
     const char* filename = NULL;
 
-    if (ConfGet("default-log-dir", &log_dir) != 1)
-        log_dir = DEFAULT_LOG_DIR;
+    log_dir = GetLogDirectory();
 
     if ( (log_filename = SCMalloc(PATH_MAX)) == NULL) {
         return NULL;

diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c
index 7840562b24aa924efe634f79ae3bca60961a1669..431be571858b71f314cc337d5def73402cf11fc7 100644 (file)
--- a/src/detect-engine-analyzer.c
+++ b/src/detect-engine-analyzer.c
@@ -192,8 +192,7 @@ int SetupFPAnalyzer(void)
         return 0;
 
     char *log_dir;
-    if (ConfGet("default-log-dir", &log_dir) != 1)
-        log_dir = DEFAULT_LOG_DIR;
+    log_dir = GetLogDirectory();
     snprintf(log_path, sizeof(log_path), "%s/%s", log_dir,
              "rules_fast_pattern.txt");
 
@@ -243,8 +242,7 @@ int SetupRuleAnalyzer(void)
         }
         if (enabled) {
             char *log_dir;
-            if (ConfGet("default-log-dir", &log_dir) != 1)
-                log_dir = DEFAULT_LOG_DIR;
+            log_dir = GetLogDirectory();
             snprintf(log_path, sizeof(log_path), "%s/%s", log_dir, "rules_analysis.txt");
             rule_engine_analysis_FD = fopen(log_path, "w");
             if (rule_engine_analysis_FD == NULL) {

diff --git a/src/log-filestore.c b/src/log-filestore.c
index 3e19527f142b3390a15fffdc8aa1b0cac955e965..bba1c3820f9235150c18a686895e9e916d3cf598 100644 (file)
--- a/src/log-filestore.c
+++ b/src/log-filestore.c
@@ -567,8 +567,7 @@ static OutputCtx *LogFilestoreLogInitCtx(ConfNode *conf)
     output_ctx->DeInit = LogFilestoreLogDeInitCtx;
 
     char *s_default_log_dir = NULL;
-    if (ConfGet("default-log-dir", &s_default_log_dir) != 1)
-        s_default_log_dir = DEFAULT_LOG_DIR;
+    s_default_log_dir = GetLogDirectory();
 
     const char *s_base_dir = NULL;
     s_base_dir = ConfNodeLookupChildValue(conf, "log-dir");

diff --git a/src/log-pcap.c b/src/log-pcap.c
index 053aabcfd7a0c5995605b6a8216bef9d538c2481..f14af0dee89d32bc73fa521a9c15c89b891e5f64 100644 (file)
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -463,8 +463,7 @@ OutputCtx *PcapLogInitCtx(ConfNode *conf)
                 exit(EXIT_FAILURE);
             } else {
                 char *log_dir = NULL;
-                if (ConfGet("default-log-dir", &log_dir) != 1)
-                    log_dir = DEFAULT_LOG_DIR;
+                log_dir = GetLogDirectory();
 
                 strlcpy(pl->dir,
                     log_dir, sizeof(pl->dir));
@@ -476,8 +475,7 @@ OutputCtx *PcapLogInitCtx(ConfNode *conf)
                         s_dir, sizeof(pl->dir));
             } else {
                 char *log_dir = NULL;
-                if (ConfGet("default-log-dir", &log_dir) != 1)
-                    log_dir = DEFAULT_LOG_DIR;
+                log_dir = GetLogDirectory();
 
                 snprintf(pl->dir, sizeof(pl->dir), "%s/%s",
                     log_dir, s_dir);

diff --git a/src/log-tlslog.c b/src/log-tlslog.c
index 6565297549593411cf68e8fed88de5259eb922a5..9059d18d9a8a9c09b00a7dd51d77c8449307501a 100644 (file)
--- a/src/log-tlslog.c
+++ b/src/log-tlslog.c
@@ -560,8 +560,7 @@ OutputCtx *LogTlsLogInitCtx(ConfNode *conf)
     }
 
     char *s_default_log_dir = NULL;
-    if (ConfGet("default-log-dir", &s_default_log_dir) != 1)
-        s_default_log_dir = DEFAULT_LOG_DIR;
+    s_default_log_dir = GetLogDirectory();
 
     const char *s_base_dir = NULL;
     s_base_dir = ConfNodeLookupChildValue(conf, "certs-log-dir");

diff --git a/src/util-debug.c b/src/util-debug.c
index 572690e8001d69932f7f275842064ffe97a07aa5..6931b01e761778d8d9b1f958ac81bf389be226e9 100644 (file)
--- a/src/util-debug.c
+++ b/src/util-debug.c
@@ -1368,8 +1368,7 @@ static char *SCLogGetLogFilename(char *filearg)
     char *log_dir;
     char *log_filename;
 
-    if (ConfGet("default-log-dir", &log_dir) != 1)
-        log_dir = DEFAULT_LOG_DIR;
+    log_dir = GetLogDirectory();
 
     log_filename = SCMalloc(PATH_MAX);
     if (unlikely(log_filename == NULL))

diff --git a/src/util-logopenfile.c b/src/util-logopenfile.c
index 0eae126aa2a857ab8b9cc67cb9ad04671c399248..3a94e2c7a3eadcc621045eedeffcbe4fde0d34aa 100644 (file)
--- a/src/util-logopenfile.c
+++ b/src/util-logopenfile.c
@@ -130,8 +130,7 @@ SCConfLogOpenGeneric(ConfNode *conf,
     if (filename == NULL)
         filename = default_filename;
 
-    if (ConfGet("default-log-dir", &log_dir) != 1)
-        log_dir = DEFAULT_LOG_DIR;
+    log_dir = GetLogDirectory();
 
     if (PathIsAbsolute(filename)) {
         snprintf(log_path, PATH_MAX, "%s", filename);

diff --git a/src/util-profiling-rules.c b/src/util-profiling-rules.c
index e7b7a2e3f2b0a2d8e9985aee689a56c21f46c9e5..0480ac71b976181fee5f91a1e668f52c7c9b9b4f 100644 (file)
--- a/src/util-profiling-rules.c
+++ b/src/util-profiling-rules.c
@@ -163,8 +163,7 @@ void SCProfilingRulesGlobalInit(void) {
             if (filename != NULL) {
 
                 char *log_dir;
-                if (ConfGet("default-log-dir", &log_dir) != 1)
-                    log_dir = DEFAULT_LOG_DIR;
+                log_dir = GetLogDirectory();
 
                 profiling_file_name = SCMalloc(PATH_MAX);
                 if (unlikely(profiling_file_name == NULL)) {

diff --git a/src/util-profiling.c b/src/util-profiling.c
index 7399116f2e0581bbd57f3a6f26774c82da5f6694..acb28c0d51758ac3f74cb801e4781219f1e0698e 100644 (file)
--- a/src/util-profiling.c
+++ b/src/util-profiling.c
@@ -148,8 +148,7 @@ SCProfilingInit(void)
             if (filename != NULL) {
 
                 char *log_dir;
-                if (ConfGet("default-log-dir", &log_dir) != 1)
-                    log_dir = DEFAULT_LOG_DIR;
+                log_dir = GetLogDirectory();
 
                 profiling_packets_file_name = SCMalloc(PATH_MAX);
                 if (unlikely(profiling_packets_file_name == NULL)) {
@@ -180,8 +179,7 @@ SCProfilingInit(void)
                 }
 
                 char *log_dir;
-                if (ConfGet("default-log-dir", &log_dir) != 1)
-                    log_dir = DEFAULT_LOG_DIR;
+                log_dir = GetLogDirectory();
 
                 profiling_csv_file_name = SCMalloc(PATH_MAX);
                 if (unlikely(profiling_csv_file_name == NULL)) {
@@ -227,8 +225,7 @@ SCProfilingInit(void)
             const char *filename = ConfNodeLookupChildValue(conf, "filename");
             if (filename != NULL) {
                 char *log_dir;
-                if (ConfGet("default-log-dir", &log_dir) != 1)
-                    log_dir = DEFAULT_LOG_DIR;
+                log_dir = GetLogDirectory();
 
                 profiling_locks_file_name = SCMalloc(PATH_MAX);
                 if (unlikely(profiling_locks_file_name == NULL)) {