From b47525df0a21385a14d3ed26d8278b591055050b Mon Sep 17 00:00:00 2001 From: pudepiedj Date: Fri, 1 Mar 2024 15:53:56 +0000 Subject: [PATCH] server tweak --- examples/server/server.cpp | 8 ++++---- examples/server/utils.hpp | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index 8b406f3bd..4d898fdaa 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -2516,13 +2516,13 @@ static void server_params_parse(int argc, char **argv, server_params &sparams, { llama.skvgraphics = true; // -skvg takes no parameter so we don't test ++i >= argc llama.skvinteract = false; - log_settings.stdout_target = "/dev/null"; + //log_settings.stdout_target = "/dev/null"; prevent stdout from interfering with the graphics display } else if (arg == "-skvi" || arg == "--show-interactive-graphics") { llama.skvgraphics = true; // -skvi takes no parameter so we don't test ++i >= argc llama.skvinteract = true; - log_settings.stdout_target = "/dev/null"; + //log_settings.stdout_target = "/dev/null"; } else if (arg == "--gpu-layers" || arg == "-ngl" || arg == "--n-gpu-layers") { @@ -2762,14 +2762,14 @@ static void server_params_parse(int argc, char **argv, server_params &sparams, break; } } - else if (arg == "--stdout-log-file") + else if (arg == "--stdout-log-file") // redirect the stdout logging to a specified file { if (++i >= argc) { invalid_param = true; break; } - log_settings.stdout_target = argv[i]; // have just noticed that there is a 'log_set_target()' below but says 'INTERNAL USE: DO NOT USE' + log_settings.stdout_target = argv[i]; // there is a 'log_set_target()' below but says 'INTERNAL USE: DO NOT USE' } else if (arg == "--log-disable") { diff --git a/examples/server/utils.hpp b/examples/server/utils.hpp index 53901eb4a..642914eba 100644 --- a/examples/server/utils.hpp +++ b/examples/server/utils.hpp @@ -215,6 +215,8 @@ static inline void server_log( }; /* + // to allow the graphics to print to stdout we redirect non-graphical stdout to stderr + // to silence the graphics we direct stdout to dev/null or just don't invoke them std::cerr << stdout_target.c_str() << std::endl; FILE* new_stdout = freopen(stdout_target.c_str(), "a", stdout); if (new_stdout == nullptr) {