affile: add pending flag to lograte_options

The pending flag should signal if a rotation is currently ongoing.
If all log files have been rotated but the main log file could not be
reopened, then the rotation should not be performed again.

Signed-off-by: Alexander Zikulnig <[email protected]>

Author: Alexander Zikulnig

modules/affile/affile-dest.c

@@ -240,14 +240,20 @@ affile_dw_logrotate(AFFileDestWriter *self, gpointer user_data)
 
   if (logrotate_is_enabled(logrotate_options) && logrotate_is_required(logrotate_options, self->cached_filesize))
     {
-      LogRotateStatus status = logrotate_do_rotate(logrotate_options, filename);
-
-      if (status != LR_SUCCESS)
+      // rotate only if there has not been an unfinished rotation before
+      if (!logrotate_is_pending(logrotate_options))
         {
-          msg_error("Error while rotating log files", evt_tag_str("filename", self->filename));
-          return FALSE;
+          LogRotateStatus status = logrotate_do_rotate(logrotate_options, filename);
+
+          if (status != LR_SUCCESS)
+            {
+              msg_error("Error while rotating log files", evt_tag_str("filename", self->filename));
+              return FALSE;
+            }
         }
 
+      logrotate_options->pending = TRUE;
+
       // The reference pointed to by p is only updated if the reopen was successful,
       // e.g. open_result == FILE_OPENER_RESULT_SUCCESS
       FileOpenerResult open_result = _dw_reopen(self, p);
@@ -256,7 +262,7 @@ affile_dw_logrotate(AFFileDestWriter *self, gpointer user_data)
           /* best case --> continue with opened file */
           msg_info("Reopened log file after logrotate",
                    evt_tag_str("filename", self->filename));
-
+          logrotate_options->pending = FALSE;
         }
       else
         {
@@ -265,6 +271,7 @@ affile_dw_logrotate(AFFileDestWriter *self, gpointer user_data)
               /* try again to reopen */
               msg_info("Trying again to re-open file after logrotate", evt_tag_str("filename", self->filename));
               gboolean success = (gboolean) main_loop_call((MainLoopTaskFunc) affile_dw_reopen, (gpointer) self, TRUE);
+              logrotate_options->pending = !success;
               return success;
             }
           else

modules/affile/logrotate.c

@@ -40,6 +40,7 @@ void logrotate_options_defaults(LogRotateOptions *logrotate_options)
   logrotate_options->max_rotations = LR_DEFAULT_ROTATIONS;
   logrotate_options->interval = NONE;
   logrotate_options->date_format = LR_DEFAULT_DATE_FORMAT;
+  logrotate_options->pending = FALSE;
 }
 
 gboolean logrotate_is_enabled(LogRotateOptions *logrotate_options)
@@ -64,6 +65,17 @@ gboolean logrotate_is_required(LogRotateOptions *logrotate_options, const gsize
   return (filesize >= logrotate_options->size);
 }
 
+gboolean logrotate_is_pending(LogRotateOptions *logrotate_options)
+{
+
+  if (logrotate_options == NULL)
+    {
+      return FALSE;
+    }
+
+  return logrotate_options->pending;
+}
+
 gchar *get_log_file_name(const gchar *filename, gsize rotation_suffix)
 {
   return g_strdup_printf("%s.%ld", filename, rotation_suffix);

modules/affile/logrotate.h

@@ -45,10 +45,12 @@ typedef struct _LogRotateOptions
   gsize max_rotations;
   interval_t interval;
   const gchar *date_format;
+  gboolean pending;
 } LogRotateOptions;
 
 gboolean logrotate_is_enabled(LogRotateOptions *logrotate_options);
 gboolean logrotate_is_required(LogRotateOptions *logrotate_options, const gsize filesize);
+gboolean logrotate_is_pending(LogRotateOptions *logrotate_options);
 void logrotate_options_defaults(LogRotateOptions *logrotate_options);
 LogRotateStatus logrotate_do_rotate(LogRotateOptions *logrotate_options, const gchar *filename);