Use new function GetLogDirectory()

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);
 

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);
 

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;

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) {

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");

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);

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");

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))

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);

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)) {

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)) {