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

[FIx #676] Add --force option to osqueryd

Browse Source
This commit is contained in:
Teddy Reed 2015-01-27 16:00:39 -08:00
parent 74d38fa354
commit a9ede83446
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
osquery/core/system.cpp
View File

@ -40,6 +40,12 @@ DEFINE_osquery_flag(string,
"/var/osquery/osqueryd.pidfile",
"The path to the pidfile for osqueryd.");
/// Should the daemon force unload previously-running osqueryd daemons.
DEFINE_osquery_flag(bool,
force,
false,
"Force osqueryd to kill previously-running daemons.");
std::string getHostname() {
char hostname[256]; // Linux max should be 64.
memset(hostname, 0, sizeof(hostname));
@ -105,12 +111,16 @@ std::vector<fs::path> getHomeDirectories() {
return results;
}
Status checkStalePid(const std::string& pidfile_content) {
Status checkStalePid(const std::string& content) {
int pid;
try {
pid = stoi(pidfile_content);
} catch (const std::invalid_argument& e) {
return Status(1, std::string("Could not parse pidfile: ") + e.what());
pid = boost::lexical_cast<int>(content);
} catch (const boost::bad_lexical_cast& e) {
if (FLAGS_force) {
return Status(0, "Force loading and not parsing pidfile");
} else {
return Status(1, "Could not parse pidfile");
}
}
int status = kill(pid, 0);
@ -125,23 +135,21 @@ Status checkStalePid(const std::string& pidfile_content) {
if (q.rows().size() >= 1 && q.rows().front()["name"] == "osqueryd") {
// If the process really is osqueryd, return an "error" status.
return Status(1,
std::string("osqueryd (") + pidfile_content +
") is already running");
if (FLAGS_force) {
// The caller may choose to abort the existing daemon with --force.
status = kill(pid, SIGQUIT);
::sleep(1);
return Status(status, "Tried to force remove the existing osqueryd");
}
return Status(1, "osqueryd (" + content + ") is already running");
} else {
LOG(INFO) << "Found stale process for osqueryd (" << pidfile_content
LOG(INFO) << "Found stale process for osqueryd (" << content
<< ") removing pidfile.";
}
}
// Now the pidfile is either the wrong pid or the pid is not running.
try {
boost::filesystem::remove(FLAGS_pidfile);
} catch (boost::filesystem::filesystem_error& e) {
// Unable to remove old pidfile.
LOG(WARNING) << "Unable to remove the osqueryd pidfile.";
}
return Status(0, "OK");
}
@ -162,6 +170,14 @@ Status createPidFile() {
}
}
// Now the pidfile is either the wrong pid or the pid is not running.
try {
boost::filesystem::remove(FLAGS_pidfile);
} catch (boost::filesystem::filesystem_error& e) {
// Unable to remove old pidfile.
LOG(WARNING) << "Unable to remove the osqueryd pidfile.";
}
// If no pidfile exists or the existing pid was stale, write, log, and run.
auto pid = boost::lexical_cast<std::string>(getpid());
LOG(INFO) << "Writing osqueryd pid (" << pid << ") to " << FLAGS_pidfile;