Skip to content
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

Jump to bottom

Add correctness tests #83

Merged
merged 5 commits into from
May 26, 2016
Merged

Add correctness tests #83

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a27194
Add graceful shutdown on SIGINT/SIGTERM.
mstemm May 19, 2016
a41bb0d
Print stats when shutting down.
mstemm May 19, 2016
4751546
Add correctness tests using Avocado
mstemm May 19, 2016
b3ae480
Another round of rule cleanups.
mstemm May 23, 2016
0f4b378
Add .gitignore for test directory.
mstemm May 23, 2016
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
30 changes: 28 additions & 2 deletions userspace/falco/falco.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ extern "C" {
#include "utils.h"
#include <yaml-cpp/yaml.h>

bool g_terminate = false;
//
// Helper functions
//
static void signal_callback(int signal)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ha, i had this initially then took it out as it wasn't necessary at the time...

{
g_terminate = true;
}

//
// Program help
Expand Down Expand Up @@ -90,7 +98,11 @@ void do_inspect(sinsp* inspector,

res = inspector->next(&ev);

if(res == SCAP_TIMEOUT)
if (g_terminate)
{
break;
}
else if(res == SCAP_TIMEOUT)
{
continue;
}
Expand Down Expand Up @@ -398,6 +410,20 @@ int falco_init(int argc, char **argv)
add_output(ls, *it);
}

if(signal(SIGINT, signal_callback) == SIG_ERR)
{
fprintf(stderr, "An error occurred while setting SIGINT signal handler.\n");
result = EXIT_FAILURE;
goto exit;
}

if(signal(SIGTERM, signal_callback) == SIG_ERR)
{
fprintf(stderr, "An error occurred while setting SIGTERM signal handler.\n");
result = EXIT_FAILURE;
goto exit;
}

if (scap_filename.size())
{
inspector->open(scap_filename);
Expand All @@ -406,7 +432,7 @@ int falco_init(int argc, char **argv)
{
try
{
inspector->open();
inspector->open(200);
}
catch(sinsp_exception e)
{
Expand Down