From: Ruben d'Arco <cyclops@prof-x.net>
Date: Thu, 29 Aug 2013 18:39:59 +0000 (+0200)
Subject: pid file with pdns_ prefix.
X-Git-Tag: rec-3.6.0-rc1~496^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02e7bdeb138a6325995885c2fff27960d6daa71d;p=thirdparty%2Fpdns.git

pid file with pdns_ prefix.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 4436b7e631..5e4fbf13aa 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1789,7 +1789,7 @@ int serviceMain(int argc, char*argv[])
       break;
   }
   
-  s_pidfname=::arg()["socket-dir"]+"/"+s_programname+".pid";
+  s_pidfname=::arg()["socket-dir"]+"/pdns_"+s_programname+".pid";
   if(!s_pidfname.empty())
     unlink(s_pidfname.c_str()); // remove possible old pid file 
   
diff --git a/regression-tests/recursor-test b/regression-tests/recursor-test
index e7f8eee145..79a1d8710b 100755
--- a/regression-tests/recursor-test
+++ b/regression-tests/recursor-test
@@ -7,7 +7,7 @@ limit=$2
 ../pdns/pdns_recursor --daemon=no --local-port=$port --socket-dir=./ --trace=fail --config-dir=. --query-local-address6=:: > recursor.log 2>&1 &
 sleep 3
 ../pdns/dnsbulktest -qe 127.0.0.1 $port $limit < top-1m.csv > bulktest.results
-kill $(cat recursor.pid)
+kill $(cat pdns_recursor.pid)
 
 . ./bulktest.results