valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 09:58:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #979 from theopolis/fast_shell_query

Browse Source 
Skip event publishers when a single query is used
This commit is contained in:
Mike Arpaia 2015-04-10 23:03:51 -07:00
commit 5cebb95134
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osquery/core/init.cpp
View File

@ -9,7 +9,9 @@
*/
#include <syslog.h>
#include <stdio.h>
#include <time.h>
#include <unistd.h>
#include <boost/algorithm/string/trim.hpp>
#include <boost/filesystem.hpp>
@ -47,6 +49,8 @@ namespace osquery {
"path. Additionally, review the \"using osqueryd\" wiki page:\n" \
" - https://github.com/facebook/osquery/wiki/using-osqueryd\n\n";
DECLARE_bool(disable_events);
CLI_FLAG(bool,
config_check,
false,
@ -114,9 +118,20 @@ Initializer::Initializer(int& argc, char**& argv, ToolType tool)
FLAGS_logger_plugin = STR(OSQUERY_DEFAULT_LOGGER_PLUGIN);
#endif
// Set version string from CMake build
GFLAGS_NAMESPACE::SetVersionString(OSQUERY_VERSION);
// Let gflags parse the non-help options/flags.
GFLAGS_NAMESPACE::ParseCommandLineFlags(
argc_, argv_, (tool == OSQUERY_TOOL_SHELL));
if (tool == OSQUERY_TOOL_SHELL) {
// The shell is transient, rewrite config-loaded paths.
osquery::FLAGS_disable_logging = true;
if (*argc_ > 1 || !isatty(fileno(stdin))) {
// A query was set as a positional argument for via stdin.
osquery::FLAGS_disable_events = true;
}
// Get the caller's home dir for temporary storage/state management.
auto homedir = osqueryHomeDirectory();
@ -127,13 +142,6 @@ Initializer::Initializer(int& argc, char**& argv, ToolType tool)
}
}
// Set version string from CMake build
GFLAGS_NAMESPACE::SetVersionString(OSQUERY_VERSION);
// Let gflags parse the non-help options/flags.
GFLAGS_NAMESPACE::ParseCommandLineFlags(
argc_, argv_, (tool == OSQUERY_TOOL_SHELL));
// If the caller is checking configuration, disable the watchdog/worker.
if (FLAGS_config_check) {
FLAGS_disable_watchdog = true;