aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2012-06-14 19:43:26 +0000
committerErmal <eri@pfsense.org>2012-06-14 19:43:45 +0000
commit7eae4615370ba69f390084033b2d6ceb222fbc30 (patch)
treecae05161932d7146f864d87477822bdc75ee371c
parent88f5369c7eaf2cf478c501755e87083bb721edb5 (diff)
downloadpfsense-packages-7eae4615370ba69f390084033b2d6ceb222fbc30.tar.gz
pfsense-packages-7eae4615370ba69f390084033b2d6ceb222fbc30.tar.bz2
pfsense-packages-7eae4615370ba69f390084033b2d6ceb222fbc30.zip
Remove pid file of barnyard2 when stopid and also remove duplicate log line
-rw-r--r--config/snort/snort.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 05280e20..fc455fc7 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -874,8 +874,6 @@ function create_snort_sh() {
#### Fake start only used on bootup and Pfsense IP changes
#### Only try to restart if snort is running on Iface
if [ "`/bin/pgrep -nF {$g['varrun_path']}/snort_{$if_real}{$snort_uuid}.pid`" = "0" ]; then
- /usr/bin/logger -p daemon.info -i -t SnortStartup "Snort already running, soft restart"
-
#### Restart Iface
/bin/pkill -HUP -F {$g['varrun_path']}/snort_{$if_real}{$snort_uuid}.pid -a
/usr/bin/logger -p daemon.info -i -t SnortStartup "Snort Soft Reload For {$snort_uuid}_{$if_real}..."
@@ -900,6 +898,7 @@ if [ "`/bin/pgrep -nF {$g['varrun_path']}/snort_{$if_real}{$snort_uuid}.pid`" =
sleep 1
if [ -f {$g['varrun_path']}/barnyard2_{$if_real}{$snort_uuid}.pid ]; then
/bin/pkill -F {$g['varrun_path']}/barnyard2_{$if_real}{$snort_uuid}.pid -a
+ /bin/rm /var/run/barnyard2_{$snort_uuid}_{$if_real}.pid
fi
/bin/rm /var/run/snort_{$snort_uuid}_{$if_real}.pid