Graceful exit when program path doesn't exist

sporksmith · sporksmith · commit 83eded84ba61 · 2021-07-21T14:09:45.000-05:00
Fixes #1522
diff --git a/src/main/bindings/c/bindings.h b/src/main/bindings/c/bindings.h
@@ -270,6 +270,9 @@ void processoptions_freeString(char *string);
 // Will return a NULL pointer if the path does not exist.
 char *processoptions_getPath(const struct ProcessOptions *proc);
 
+// Returns the path exactly as specified in the config. Caller must free returned string.
+char *processoptions_getRawPath(const struct ProcessOptions *proc);
+
 void processoptions_getArgs(const struct ProcessOptions *proc,
                             void (*f)(const char*, void*),
                             void *data);
diff --git a/src/main/core/controller.c b/src/main/core/controller.c
@@ -229,7 +229,9 @@ static void _controller_registerProcessCallback(const ProcessOptions* proc, void
 
     char* plugin = processoptions_getPath(proc);
     if (plugin == NULL) {
-        utility_panic("The process binary could not be found");
+        error("For host '%s', couldn't find program path: '%s'", callbackArgs->hostname,
+              processoptions_getRawPath(proc));
+        exit(EXIT_FAILURE);
     }
 
     // build an argv array
diff --git a/src/main/core/support/configuration.rs b/src/main/core/support/configuration.rs
@@ -1577,6 +1577,14 @@ mod export {
         }
     }
 
+    /// Returns the path exactly as specified in the config. Caller must free returned string.
+    #[no_mangle]
+    pub extern "C" fn processoptions_getRawPath(proc: *const ProcessOptions) -> *mut libc::c_char {
+        assert!(!proc.is_null());
+        let proc = unsafe { proc.as_ref().unwrap() };
+        CString::into_raw(CString::new(proc.path.to_string_lossy().as_bytes()).unwrap())
+    }
+
     #[no_mangle]
     pub extern "C" fn processoptions_getArgs(
         proc: *const ProcessOptions,

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,9 @@ static void _controller_registerProcessCallback(const ProcessOptions* proc, void`
`229`	`229`
`230`	`230`	`char* plugin = processoptions_getPath(proc);`
`231`	`231`	`if (plugin == NULL) {`
`232`		`- utility_panic("The process binary could not be found");`
	`232`	`+ error("For host '%s', couldn't find program path: '%s'", callbackArgs->hostname,`
	`233`	`+ processoptions_getRawPath(proc));`
	`234`	`+ exit(EXIT_FAILURE);`
`233`	`235`	`}`
`234`	`236`
`235`	`237`	`// build an argv array`
Original file line number	Diff line number	Diff line change
`@@ -1577,6 +1577,14 @@ mod export {`
`1577`	`1577`	`}`
`1578`	`1578`	`}`
`1579`	`1579`
	`1580`	`+ /// Returns the path exactly as specified in the config. Caller must free returned string.`
	`1581`	`+ #[no_mangle]`
	`1582`	`+ pub extern "C" fn processoptions_getRawPath(proc: const ProcessOptions) -> mut libc::c_char {`
	`1583`	`+ assert!(!proc.is_null());`
	`1584`	`+ let proc = unsafe { proc.as_ref().unwrap() };`
	`1585`	`+ CString::into_raw(CString::new(proc.path.to_string_lossy().as_bytes()).unwrap())`
	`1586`	`+ }`
	`1587`	`+`
`1580`	`1588`	`#[no_mangle]`
`1581`	`1589`	`pub extern "C" fn processoptions_getArgs(`
`1582`	`1590`	`proc: *const ProcessOptions,`