Skip to content

Commit ff14791

Browse files
sxdJonathan Gonzalez V
andauthored
dump: use stderr instead of stdout when getting SIGCONT (#2438)
Signed-off-by: Jonathan Gonzalez V <[email protected]> Co-authored-by: Jonathan Gonzalez V <[email protected]>
1 parent 4b9ac8c commit ff14791

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

src/flb_dump.c

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ static void dump_input_chunks(struct flb_config *ctx)
6767
struct flb_input_chunk *ic;
6868
struct flb_task *task;
6969

70-
fprintf(stdout, "\n===== Input =====\n");
70+
fprintf(stderr, "\n===== Input =====\n");
7171

7272
mk_list_foreach(head, &ctx->inputs) {
7373
i = mk_list_entry(head, struct flb_input_instance, _head);
74-
fprintf(stdout, "%s (%s)\n", flb_input_name(i), i->p->name);
74+
fprintf(stderr, "%s (%s)\n", flb_input_name(i), i->p->name);
7575

76-
fprintf(stdout, "│\n");
77-
fprintf(stdout, "├─ status\n");
76+
fprintf(stderr, "│\n");
77+
fprintf(stderr, "├─ status\n");
7878

7979
/* Overlimit checks */
8080
ret = FLB_FALSE;
@@ -83,19 +83,19 @@ static void dump_input_chunks(struct flb_config *ctx)
8383
ret = FLB_TRUE;
8484
}
8585
}
86-
fprintf(stdout, "│ └─ overlimit : %s\n",
86+
fprintf(stderr, "│ └─ overlimit : %s\n",
8787
ret ? "yes" : "no");
8888

8989
/* Current memory size used based on last ingestion */
9090
flb_utils_bytes_to_human_readable_size(i->mem_chunks_size,
9191
tmp, sizeof(tmp) - 1);
92-
fprintf(stdout, "│ ├─ mem size : %s (%lu bytes)\n",
92+
fprintf(stderr, "│ ├─ mem size : %s (%lu bytes)\n",
9393
tmp, i->mem_chunks_size);
9494

9595
/* Mem buf limit set */
9696
flb_utils_bytes_to_human_readable_size(i->mem_buf_limit,
9797
tmp, sizeof(tmp) - 1);
98-
fprintf(stdout, "│ └─ mem limit : %s (%lu bytes)\n",
98+
fprintf(stderr, "│ └─ mem limit : %s (%lu bytes)\n",
9999
tmp, i->mem_buf_limit);
100100

101101
/*
@@ -108,9 +108,9 @@ static void dump_input_chunks(struct flb_config *ctx)
108108
* For short: every task is a chunk. But it's a different structure
109109
* handled by the engine to coordinate the flush process.
110110
*/
111-
fprintf(stdout, "│\n");
112-
fprintf(stdout, "├─ tasks\n");
113-
fprintf(stdout, "│ ├─ total tasks : %i\n", mk_list_size(&i->tasks));
111+
fprintf(stderr, "│\n");
112+
fprintf(stderr, "├─ tasks\n");
113+
fprintf(stderr, "│ ├─ total tasks : %i\n", mk_list_size(&i->tasks));
114114

115115
size = 0;
116116
task_new = 0;
@@ -129,9 +129,9 @@ static void dump_input_chunks(struct flb_config *ctx)
129129

130130
flb_utils_bytes_to_human_readable_size(size, tmp, sizeof(tmp) - 1);
131131

132-
fprintf(stdout, "│ ├─ new : %i\n", task_new);
133-
fprintf(stdout, "│ ├─ running : %i\n", task_running);
134-
fprintf(stdout, "│ └─ size : %s (%lu bytes)\n", tmp, size);
132+
fprintf(stderr, "│ ├─ new : %i\n", task_new);
133+
fprintf(stderr, "│ ├─ running : %i\n", task_running);
134+
fprintf(stderr, "│ └─ size : %s (%lu bytes)\n", tmp, size);
135135

136136
/*
137137
* Chunks
@@ -145,11 +145,11 @@ static void dump_input_chunks(struct flb_config *ctx)
145145
* of them are 'down' and only get 'up' when they are going to be
146146
* processed.
147147
*/
148-
fprintf(stdout, "│\n");
149-
fprintf(stdout, "└─ chunks\n");
148+
fprintf(stderr, "│\n");
149+
fprintf(stderr, "└─ chunks\n");
150150

151151
/* Number of chunks registered */
152-
fprintf(stdout, " └─ total chunks : %i\n", mk_list_size(&i->chunks));
152+
fprintf(stderr, " └─ total chunks : %i\n", mk_list_size(&i->chunks));
153153

154154
/* Busy chunks
155155
* -----------
@@ -186,14 +186,14 @@ static void dump_input_chunks(struct flb_config *ctx)
186186
}
187187
}
188188

189-
fprintf(stdout, " ├─ up chunks : %i\n", up);
190-
fprintf(stdout, " ├─ down chunks: %i\n", down);
189+
fprintf(stderr, " ├─ up chunks : %i\n", up);
190+
fprintf(stderr, " ├─ down chunks: %i\n", down);
191191
flb_utils_bytes_to_human_readable_size(busy_size, tmp, sizeof(tmp) - 1);
192192

193-
fprintf(stdout, " └─ busy chunks: %i\n", busy);
194-
fprintf(stdout, " ├─ size : %s (%lu bytes)\n", tmp, busy_size);
195-
fprintf(stdout, " └─ size err: %i\n", busy_size_err);
196-
fprintf(stdout, "\n");
193+
fprintf(stderr, " └─ busy chunks: %i\n", busy);
194+
fprintf(stderr, " ├─ size : %s (%lu bytes)\n", tmp, busy_size);
195+
fprintf(stderr, " └─ size err: %i\n", busy_size_err);
196+
fprintf(stderr, "\n");
197197
}
198198
}
199199

@@ -206,14 +206,14 @@ static void dump_storage(struct flb_config *ctx)
206206
{
207207
struct cio_stats storage_st;
208208

209-
fprintf(stdout, "\n===== Storage Layer =====\n");
209+
fprintf(stderr, "\n===== Storage Layer =====\n");
210210
cio_stats_get(ctx->cio, &storage_st);
211211

212-
fprintf(stdout, "total chunks : %i\n", storage_st.chunks_total);
213-
fprintf(stdout, "├─ mem chunks : %i\n", storage_st.chunks_mem);
214-
fprintf(stdout, "└─ fs chunks : %i\n", storage_st.chunks_fs);
215-
fprintf(stdout, " ├─ up : %i\n", storage_st.chunks_fs_up);
216-
fprintf(stdout, " └─ down : %i\n", storage_st.chunks_fs_down);
212+
fprintf(stderr, "total chunks : %i\n", storage_st.chunks_total);
213+
fprintf(stderr, "├─ mem chunks : %i\n", storage_st.chunks_mem);
214+
fprintf(stderr, "└─ fs chunks : %i\n", storage_st.chunks_fs);
215+
fprintf(stderr, " ├─ up : %i\n", storage_st.chunks_fs_up);
216+
fprintf(stderr, " └─ down : %i\n", storage_st.chunks_fs_down);
217217
}
218218

219219
void flb_dump(struct flb_config *ctx)
@@ -224,7 +224,7 @@ void flb_dump(struct flb_config *ctx)
224224
now = time(NULL);
225225
current = localtime(&now);
226226

227-
fprintf(stdout,
227+
fprintf(stderr,
228228
"[%i/%02i/%02i %02i:%02i:%02i] Fluent Bit Dump\n",
229229
current->tm_year + 1900,
230230
current->tm_mon + 1,
@@ -243,7 +243,7 @@ void flb_dump(struct flb_config *ctx)
243243
* If we are in a co-routine likely we need a different libbacktrace
244244
* context, but it's just a guess, not tested.
245245
*/
246-
//fprintf(stdout, "\n===== Stacktrace =====\n");
246+
//fprintf(stderr, "\n===== Stacktrace =====\n");
247247
//flb_stacktrace_print();
248248
#endif
249249

@@ -256,5 +256,5 @@ void flb_dump(struct flb_config *ctx)
256256
/* Make sure to flush the stdout buffer in case output
257257
* has been redirected to a file
258258
*/
259-
fflush(stdout);
259+
fflush(stderr);
260260
}

0 commit comments

Comments
 (0)