github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-06-21 12:29:19 +00:00
Code Issues Projects Releases Wiki Activity

chore(userspace/falco): make log message termination consistent

Browse Source 
Signed-off-by: Jason Dellaluce <jasondellaluce@gmail.com>
This commit is contained in:
Jason Dellaluce 2022-10-06 16:50:54 +00:00 committed by poiana
parent e85a8c914f
commit 3c02b40a21
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
userspace/engine/falco_engine.cpp
View File

@ -448,7 +448,7 @@ void falco_engine::read_file(const std::string& filename, std::string& contents)
is.open(filename); is.open(filename);
if (!is.is_open()) if (!is.is_open())
{ {
throw falco_exception("Could not open " + filename + " for reading."); throw falco_exception("Could not open " + filename + " for reading");
} }
contents.assign(istreambuf_iterator<char>(is), contents.assign(istreambuf_iterator<char>(is),

2
userspace/falco/app_actions/create_requested_paths.cpp
View File

@ -37,7 +37,7 @@ application::run_result application::create_requested_paths()
std::ifstream reader(m_options.gvisor_config); std::ifstream reader(m_options.gvisor_config);
if (reader.fail()) if (reader.fail())
{ {
return run_result::fatal(m_options.gvisor_config + ": cannot open file."); return run_result::fatal(m_options.gvisor_config + ": cannot open file");
} }
nlohmann::json parsed_json; nlohmann::json parsed_json;

10
userspace/falco/app_actions/create_signal_handlers.cpp
View File

@ -93,7 +93,7 @@ application::run_result application::attach_inotify_signals()
inot_fd = inotify_init(); inot_fd = inotify_init();
if (inot_fd == -1) if (inot_fd == -1)
{ {
return run_result::fatal("Could not create inotify handler."); return run_result::fatal("Could not create inotify handler");
} }
struct sigaction sa; struct sigaction sa;
@ -102,13 +102,13 @@ application::run_result application::attach_inotify_signals()
sa.sa_handler = restart_falco; sa.sa_handler = restart_falco;
if (sigaction(SIGIO, &sa, NULL) == -1) if (sigaction(SIGIO, &sa, NULL) == -1)
{ {
return run_result::fatal("Failed to link SIGIO to inotify handler."); return run_result::fatal("Failed to link SIGIO to inotify handler");
} }
/* Set owner process that is to receive "I/O possible" signal */ /* Set owner process that is to receive "I/O possible" signal */
if (fcntl(inot_fd, F_SETOWN, getpid()) == -1) if (fcntl(inot_fd, F_SETOWN, getpid()) == -1)
{ {
return run_result::fatal("Failed to setting owner on inotify handler."); return run_result::fatal("Failed to setting owner on inotify handler");
} }
/* /*
@ -118,14 +118,14 @@ application::run_result application::attach_inotify_signals()
int flags = fcntl(inot_fd, F_GETFL); int flags = fcntl(inot_fd, F_GETFL);
if (fcntl(inot_fd, F_SETFL, flags | O_ASYNC | O_NONBLOCK) == -1) if (fcntl(inot_fd, F_SETFL, flags | O_ASYNC | O_NONBLOCK) == -1)
{ {
return run_result::fatal("Failed to setting flags on inotify handler."); return run_result::fatal("Failed to setting flags on inotify handler");
} }
// Watch conf file // Watch conf file
int wd = inotify_add_watch(inot_fd, m_options.conf_filename.c_str(), IN_CLOSE_WRITE); int wd = inotify_add_watch(inot_fd, m_options.conf_filename.c_str(), IN_CLOSE_WRITE);
if (wd == -1) if (wd == -1)
{ {
return run_result::fatal("Failed to watch conf file."); return run_result::fatal("Failed to watch conf file");
} }
falco_logger::log(LOG_DEBUG, "Watching " + m_options.conf_filename +"\n"); falco_logger::log(LOG_DEBUG, "Watching " + m_options.conf_filename +"\n");

6
userspace/falco/app_actions/daemonize.cpp
View File

@ -34,7 +34,7 @@ application::run_result application::daemonize()
pid = fork(); pid = fork();
if (pid < 0) { if (pid < 0) {
// error // error
return run_result::fatal("Could not fork."); return run_result::fatal("Could not fork");
} else if (pid > 0) { } else if (pid > 0) {
// parent. Write child pid to pidfile and exit // parent. Write child pid to pidfile and exit
std::ofstream pidfile; std::ofstream pidfile;
@ -54,7 +54,7 @@ application::run_result application::daemonize()
// Become own process group. // Become own process group.
sid = setsid(); sid = setsid();
if (sid < 0) { if (sid < 0) {
return run_result::fatal("Could not set session id."); return run_result::fatal("Could not set session id");
} }
// Set umask so no files are world anything or group writable. // Set umask so no files are world anything or group writable.
@ -62,7 +62,7 @@ application::run_result application::daemonize()
// Change working directory to '/' // Change working directory to '/'
if ((chdir("/")) < 0) { if ((chdir("/")) < 0) {
return run_result::fatal("Could not change working directory to '/'."); return run_result::fatal("Could not change working directory to '/'");
} }
// Close stdin, stdout, stderr and reopen to /dev/null // Close stdin, stdout, stderr and reopen to /dev/null

2
userspace/falco/app_actions/open_inspector.cpp
View File

@ -108,7 +108,7 @@ application::run_result application::open_live_inspector(
catch(sinsp_exception &e) catch(sinsp_exception &e)
{ {
// Try to insert the Falco kernel module // Try to insert the Falco kernel module
falco_logger::log(LOG_INFO, "Trying to inject the Kernel module and starting the capture again..."); falco_logger::log(LOG_INFO, "Trying to inject the Kernel module and opening the capture again...");
if(system("modprobe " DRIVER_NAME " > /dev/null 2> /dev/null")) if(system("modprobe " DRIVER_NAME " > /dev/null 2> /dev/null"))
{ {
falco_logger::log(LOG_ERR, "Unable to load the driver\n"); falco_logger::log(LOG_ERR, "Unable to load the driver\n");