summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@world.inf.org>2013-01-06 21:07:47 +0545
committerPhil Davis <phil.davis@world.inf.org>2013-01-06 21:07:47 +0545
commitc4594e364ee820ba17d1b5369587c4c2071045e9 (patch)
treed9a7e70bded4a35e426952f87a97e523645d39b3
parent16d9ad13e3ecba4bfbf7c0d1df1be5cab52c157a (diff)
downloadpfsense-c4594e364ee820ba17d1b5369587c4c2071045e9.zip
pfsense-c4594e364ee820ba17d1b5369587c4c2071045e9.tar.gz
Prevent no such file message when pid file does not exist
-rw-r--r--etc/inc/util.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 1e5fb79..858d663 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -41,11 +41,13 @@ function killbypid($pidfile) {
return sigkillbypid($pidfile, "TERM");
}
-function isvalidpid($pid) {
+function isvalidpid($pidfile) {
$output = "";
- exec("/bin/pgrep -nF {$pid}", $output, $retval);
-
- return (intval($retval) == 0);
+ if (file_exists($pidfile)) {
+ exec("/bin/pgrep -nF {$pidfile}", $output, $retval);
+ return (intval($retval) == 0);
+ }
+ return false;
}
function is_process_running($process) {
OpenPOWER on IntegriCloud