Fix osquery exit with wrong status

Summary: osquery returned status 1(error) always when osqueryd service install uninstall was requested by the flags. Even if install/uninstall was successfull. Add extra logging in case of success. Exit with status 0 when successfully installed/uninstalled Reviewed By: jessek Differential Revision: D14622771 fbshipit-source-id: c0c7569a2b13434e2ad28ba92cba308024b044ec
osquery · Mar 26, 2019 · 3824c2e · 3824c2e
1 parent 85eb77a
commit 3824c2e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/osquery/main/main.cpp b/osquery/main/main.cpp
@@ -155,15 +155,21 @@ int startOsquery(int argc, char* argv[], std::function<void()> shutdown) {
 
   if (FLAGS_install) {
     auto binPath = fs::system_complete(fs::path(argv[0]));
-    if (!installService(binPath.string())) {
+    if (installService(binPath.string())) {
+      LOG(INFO) << "osqueryd service was installed successfully.";
+      return 0;
+    } else {
       LOG(ERROR) << "Unable to install the osqueryd service";
+      return 1;
     }
-    return 1;
   } else if (FLAGS_uninstall) {
-    if (!uninstallService()) {
+    if (uninstallService()) {
+      LOG(INFO) << "osqueryd service was uninstalled successfully.";
+      return 0;
+    } else {
       LOG(ERROR) << "Unable to uninstall the osqueryd service";
+      return 1;
     }
-    return 1;
   }
 
   runner.installShutdown(shutdown);