From 93edb361108f6a906a8c9848d7a085cd88985b71 Mon Sep 17 00:00:00 2001 From: Anton Sidorov Date: Wed, 19 Mar 2025 17:20:28 +0000 Subject: [PATCH 1/3] logger: --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7b66466..f308780 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: CI on: push: branches-ignore: - - main + - "*" pull_request: branches: - main @@ -21,7 +21,7 @@ jobs: - name: Checkout Crux repository as a sibling uses: actions/checkout@v4 with: - repository: meslab/crux # Replace with actual org/user + repository: meslab/crux path: crux - name: Build Crux From ed254e12e3a21e041ac1f7fd28de3a9599f1bf4b Mon Sep 17 00:00:00 2001 From: Anton Sidorov Date: Wed, 19 Mar 2025 17:30:50 +0000 Subject: [PATCH 2/3] logger: --- include/arg_parser.h | 5 +++-- main/csky.c | 9 +-------- src/arg_parser.c | 4 ++-- test/csky.c | 9 +-------- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/include/arg_parser.h b/include/arg_parser.h index a97b23f..32f8885 100644 --- a/include/arg_parser.h +++ b/include/arg_parser.h @@ -3,14 +3,15 @@ #include #include +#include typedef struct Options { uint16_t tcp_port; uint8_t verbose; char *tcp_server; char *log_level; - char *err_log; - char *out_log; + FILE *err_log; + FILE *out_log; } Options; void arguments_parse(int argc, char *argv[], Options *opt); diff --git a/main/csky.c b/main/csky.c index 62488de..9c5ef70 100644 --- a/main/csky.c +++ b/main/csky.c @@ -13,15 +13,8 @@ int main(int argc, char *argv[]) { LinearMemoryArena linear_arena; linear_arena_init(&linear_arena, 1024 * 1024); - LoggerOptions logger_options = { - .verbose = opts.verbose, - .log_level = opts.log_level, - .err_log = opts.err_log, - .out_log = opts.out_log - }; - Logger *logger = (Logger *)linear_arena_alloc(&linear_arena, sizeof(Logger)); - logger_init(logger, &logger_options); + logger_init(logger, NULL, NULL, opts.log_level); ringBuffer *ring_buffer = linear_arena_alloc(&linear_arena, sizeof(ring_buffer)); ring_buffer_init(ring_buffer); diff --git a/src/arg_parser.c b/src/arg_parser.c index 7d0cb0b..0d5558e 100644 --- a/src/arg_parser.c +++ b/src/arg_parser.c @@ -46,12 +46,12 @@ void arguments_parse(int argc, char *argv[], Options *opts) { break; case 'o': if (optarg) { - opts->out_log = optarg; + opts->out_log = fopen(optarg, "a"); } break; case 'e': if (optarg) { - opts->err_log = optarg; + opts->err_log = fopen(optarg, "a"); } break; case 'l': diff --git a/test/csky.c b/test/csky.c index 511d78d..c7fc095 100644 --- a/test/csky.c +++ b/test/csky.c @@ -7,15 +7,8 @@ int main(int argc, char *argv[]) { Options opts; arguments_parse(argc, argv, &opts); - LoggerOptions logger_options = { - .verbose = opts.verbose, - .log_level = opts.log_level, - .err_log = opts.err_log, - .out_log = opts.out_log - }; - Logger logger; - logger_init(&logger, &logger_options); + logger_init(&logger, opts.err_log, opts.out_log, opts.log_level); // Example 26-character hex string (13 bytes) const char *hex_str_26 = "7890ABCDEF1234567890ABCDEF"; From c74999e6d87aec3df94a944bdb15b6763f271163 Mon Sep 17 00:00:00 2001 From: Anton Sidorov Date: Wed, 19 Mar 2025 17:38:39 +0000 Subject: [PATCH 3/3] logger: --- main/csky.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/csky.c b/main/csky.c index 9c5ef70..a9f25ce 100644 --- a/main/csky.c +++ b/main/csky.c @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) { linear_arena_init(&linear_arena, 1024 * 1024); Logger *logger = (Logger *)linear_arena_alloc(&linear_arena, sizeof(Logger)); - logger_init(logger, NULL, NULL, opts.log_level); + logger_init(logger, opts.err_log, opts.out_log, opts.log_level); ringBuffer *ring_buffer = linear_arena_alloc(&linear_arena, sizeof(ring_buffer)); ring_buffer_init(ring_buffer);