X Tutup
The Wayback Machine - https://web.archive.org/web/20220305070149/https://github.com/osquery/osquery/pull/3403
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.

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

watcher: Do not initialize the config in watcher #3403

Merged
merged 2 commits into from Jun 14, 2017

Conversation

theopolis
Copy link
Member

@theopolis theopolis commented Jun 13, 2017

This should fix an error in the watchdog, where an exception is thrown when attempting to use the database. Previously we used the Config, and on initialization it constructed a Schedule, which attempted to look up the last-failed query from the database.

@facebook-github-bot
Copy link

@facebook-github-bot facebook-github-bot commented Jun 13, 2017

@theopolis updated the pull request - view changes

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit d72ef3d (Job results: 1944) failed one or more tests (Windows).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit d72ef3d (Job results: 5061) failed one or more tests (Linux).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit d72ef3d (Job results: 1185) failed one or more tests (macOS/OS X).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit d72ef3d (Job results: 1945) failed one or more tests (Windows).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit d72ef3d (Job results: 5062) failed one or more tests (Linux).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit d72ef3d (Job results: 1186) failed one or more tests (macOS/OS X).

// Conditionally begin the distributed query service
auto s = osquery::startDistributed();
if (!s.ok()) {
VLOG(1) << "Not starting the distributed query service: " << s.toString();
Copy link
Contributor

@muffins muffins Jun 13, 2017

Choose a reason for hiding this comment

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

I think you need an #include <osquery/logger.h>

@@ -16,12 +16,9 @@

#include <osquery/core.h>
#include <osquery/flags.h>
#include <osquery/logger.h>
Copy link
Member Author

@theopolis theopolis Jun 13, 2017

Choose a reason for hiding this comment

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

@PoppySeedPlehzr, this is the line that should be included, right?

@theopolis theopolis force-pushed the no_config_watcher branch from d72ef3d to a19c1d8 Jun 13, 2017
@facebook-github-bot
Copy link

@facebook-github-bot facebook-github-bot commented Jun 13, 2017

@theopolis updated the pull request - view changes

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit a19c1d8 (Job results: 1946) failed one or more tests (Windows).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit a19c1d8 (Job results: 5063) failed one or more tests (Linux).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit a19c1d8 (Job results: 1947) failed one or more tests (Windows).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit a19c1d8 (Job results: 1187) failed one or more tests (macOS/OS X).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit a19c1d8 (Job results: 5064) failed one or more tests (Linux).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit a19c1d8 (Job results: 1188) failed one or more tests (macOS/OS X).

@theopolis theopolis force-pushed the no_config_watcher branch from a19c1d8 to 2ec17ac Jun 13, 2017
@facebook-github-bot
Copy link

@facebook-github-bot facebook-github-bot commented Jun 13, 2017

@theopolis updated the pull request - view changes

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit 2ec17ac (Job results: 1948) failed one or more tests (Windows).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit 2ec17ac (Job results: 1949) failed one or more tests (Windows).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit 2ec17ac (Job results: 83) failed one or more tests (FreeBSD).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 13, 2017

👎 The commit 2ec17ac (Job results: 85) failed one or more tests (FreeBSD).

@facebook-github-bot
Copy link

@facebook-github-bot facebook-github-bot commented Jun 14, 2017

@theopolis updated the pull request - view changes

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 14, 2017

👎 The commit 93f6f36 (Job results: 90) failed one or more tests (FreeBSD).

@theopolis theopolis force-pushed the no_config_watcher branch from 93f6f36 to afe0eb6 Jun 14, 2017
@facebook-github-bot
Copy link

@facebook-github-bot facebook-github-bot commented Jun 14, 2017

@theopolis updated the pull request - view changes

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 14, 2017

👎 The commit afe0eb6 (Job results: 91) failed one or more tests (FreeBSD).

@osqueryer
Copy link

@osqueryer osqueryer commented Jun 14, 2017

👎 The commit afe0eb6 (Job results: 92) failed one or more tests (FreeBSD).

@theopolis theopolis merged commit f8f5718 into osquery:master Jun 14, 2017
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
X Tutup