Skip to content

Rotation Feature: #7541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rotation Feature: #7541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 55 additions & 7 deletions plugins/out_file/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
#include <Shlwapi.h>
#endif

#include <time.h>

#include "file.h"

#ifdef FLB_SYSTEM_WINDOWS
Expand All @@ -51,6 +53,7 @@ struct flb_file_conf {
const char *delimiter;
const char *label_delimiter;
const char *template;
int rotation;
int format;
int csv_column_names;
int mkdir;
Expand All @@ -76,12 +79,21 @@ static char *check_delimiter(const char *str)
return NULL;
}

static int check_integer(const char *str)
{
if (str == NULL) {
return 0;
}
return(atoi(str));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this probably needs a lot more defensive code around it to handle all the possible failure outcomes and "undefined behaviour" of atoi: https://cplusplus.com/reference/cstdlib/atoi/

It should also test invalid strings, etc. to confirm.

}


static int cb_file_init(struct flb_output_instance *ins,
struct flb_config *config,
void *data)
{
int ret;
int rotation;
const char *tmp;
char *ret_str;
(void) config;
Expand All @@ -98,13 +110,20 @@ static int cb_file_init(struct flb_output_instance *ins,
ctx->delimiter = NULL;
ctx->label_delimiter = NULL;
ctx->template = NULL;
ctx->rotation = 1;

ret = flb_output_config_map_set(ins, (void *) ctx);
if (ret == -1) {
flb_free(ctx);
return -1;
}

tmp = flb_output_get_property("Rotation", ins);
if(tmp) {
rotation = check_integer(tmp);
if((rotation > 0) && (rotation <= 1440)) {
ctx->rotation = rotation;
}
}
/* Optional, file format */
tmp = flb_output_get_property("Format", ins);
if (tmp) {
Expand Down Expand Up @@ -468,23 +487,46 @@ static void cb_file_flush(struct flb_event_chunk *event_chunk,

(void) config;

time_t t = time(NULL);
struct tm current_timestamp = *localtime(&t);
static struct tm last_timestamp;
static struct tm file_timestamp;
static int first_time_flag = 1;

if(first_time_flag==1) {
first_time_flag = 0;
last_timestamp = current_timestamp;
file_timestamp = current_timestamp;
}

if(current_timestamp.tm_min >= last_timestamp.tm_min + ctx->rotation) {
file_timestamp = current_timestamp;
last_timestamp = current_timestamp;
}

/* Set the right output file */
if (ctx->out_path) {
if (ctx->out_file) {
snprintf(out_file, PATH_MAX - 1, "%s/%s",
ctx->out_path, ctx->out_file);
snprintf(out_file, PATH_MAX - 1, "%s/%04d%02d%02d_%02d%02d%02d-%s",
ctx->out_path, 1900+file_timestamp.tm_year, file_timestamp.tm_mon+1, file_timestamp.tm_mday,
file_timestamp.tm_hour, file_timestamp.tm_min, file_timestamp.tm_sec, ctx->out_file);
}
else {
snprintf(out_file, PATH_MAX - 1, "%s/%s",
ctx->out_path, event_chunk->tag);
snprintf(out_file, PATH_MAX - 1, "%s/%04d%02d%02d_%02d%02d%02d-%s",
ctx->out_path, 1900+file_timestamp.tm_year, file_timestamp.tm_mon+1, file_timestamp.tm_mday,
file_timestamp.tm_hour, file_timestamp.tm_min, file_timestamp.tm_sec, event_chunk->tag);
}
}
else {
if (ctx->out_file) {
snprintf(out_file, PATH_MAX - 1, "%s", ctx->out_file);
snprintf(out_file, PATH_MAX - 1, "%04d%02d%02d_%02d%02d%02d-%s",
1900+file_timestamp.tm_year, file_timestamp.tm_mon+1, file_timestamp.tm_mday,
file_timestamp.tm_hour, file_timestamp.tm_min, file_timestamp.tm_sec, ctx->out_file);
}
else {
snprintf(out_file, PATH_MAX - 1, "%s", event_chunk->tag);
snprintf(out_file, PATH_MAX - 1, "%04d%02d%02d_%02d%02d%02d-%s",
1900+file_timestamp.tm_year, file_timestamp.tm_mon+1, file_timestamp.tm_mday,
file_timestamp.tm_hour, file_timestamp.tm_min, file_timestamp.tm_sec, event_chunk->tag);
}
}

Expand Down Expand Up @@ -676,6 +718,12 @@ static struct flb_config_map config_map[] = {
"Set a custom template format for the data"
},

{
FLB_CONFIG_MAP_INT, "rotation", "{time} {message}",
1, FLB_TRUE, 0,
"Set a custom rotation frequency for the data"
},

{
FLB_CONFIG_MAP_BOOL, "csv_column_names", "false",
0, FLB_TRUE, offsetof(struct flb_file_conf, csv_column_names),
Expand Down