Skip to content

Enable --quiet logging suppression for serve mode #508

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
heliosran wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enable --quiet logging suppression for serve mode #508

Show file tree
Hide file tree
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
39 changes: 30 additions & 9 deletions src/include/utils/debug_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@
#include <iomanip>
#include <string>

namespace debug_utils {
inline bool& quiet_mode() {
static bool enabled = false;
return enabled;
}

inline void set_quiet_mode(bool enabled) {
quiet_mode() = enabled;
}

inline bool is_quiet_mode() {
return quiet_mode();
}
} // namespace debug_utils

#ifndef VERBOSE
#define VERBOSE 0
#endif
Expand Down Expand Up @@ -109,19 +124,23 @@
/// \param msg the message to log
#define header_print(header, msg) \
do { \
std::ostringstream oss; \
oss << msg; \
std::cout << '[' << header << "] " << oss.str() << std::endl; \
if (!debug_utils::is_quiet_mode()) { \
std::ostringstream oss; \
oss << msg; \
std::cout << '[' << header << "] " << oss.str() << std::endl; \
} \
} while (0)

/// \brief header_print_r macro, in red color
/// \param header the header of the message
/// \param msg the message to log
#define header_print_r(header, msg) \
do { \
std::ostringstream oss; \
oss << msg; \
std::cerr << "\033[31m[" << header << "] " << oss.str() << "\033[0m" << std::endl; \
if (!debug_utils::is_quiet_mode()) { \
std::ostringstream oss; \
oss << msg; \
std::cerr << "\033[31m[" << header << "] " << oss.str() << "\033[0m" << std::endl; \
} \
} while (0)


Expand All @@ -130,9 +149,11 @@
/// \param msg the message to log
#define header_print_g(header, msg) \
do { \
std::ostringstream oss; \
oss << msg; \
std::cout << "\033[32m[" << header << "] " << oss.str() << "\033[0m" << std::endl; \
if (!debug_utils::is_quiet_mode()) { \
std::ostringstream oss; \
oss << msg; \
std::cout << "\033[32m[" << header << "] " << oss.str() << "\033[0m" << std::endl; \
} \
} while (0)

/// \brief box_print macro
Expand Down
19 changes: 12 additions & 7 deletions src/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
#include "server.hpp"
#include "model_list.hpp"
#include "model_downloader.hpp"
#include "update.hpp"
#include "utils/utils.hpp"
#include "program_args.hpp"
#include "update.hpp"
#include "utils/utils.hpp"
#include "utils/debug_utils.hpp"
#include "program_args.hpp"
#include "minja/chat-template.hpp"
#include <cstring>
#include <iostream>
Expand Down Expand Up @@ -469,10 +470,14 @@ int main(int argc, char* argv[]) {

// Parse command line arguments using Boost Program Options
program_args_t parsed_args;
if (!arg_utils::parse_options(argc, argv, parsed_args)) {
return 1; // Help was already printed by Boost Program Options
}

if (!arg_utils::parse_options(argc, argv, parsed_args)) {
return 1; // Help was already printed by Boost Program Options
}

if (parsed_args.command == "serve" && parsed_args.sub_process_mode) {
debug_utils::set_quiet_mode(true);
}


// Get the command, model tag, and force flag
std::string exe_dir = utils::get_executable_directory();
Expand Down
Loading