Correct valet-dns race condition with PID

cpriego · cpriego · commit d5251d5cbdcb · 2017-10-01T23:00:13.000-05:00
diff --git a/cli/stubs/valet-dns b/cli/stubs/valet-dns
@@ -102,8 +102,6 @@ function watchDirs() {
     inotifywait -q -m -e modify -e create -e delete --format "%w%f" "${WATCHERS[@]}" | while read change; do
         updateNameservers
     done &
-
-    pgrep -f 'inotifywait -q -m -e modify' | tee "${WORKDIR}/watch.pid" &>/dev/null
 }
 
 function main() {
@@ -131,6 +129,7 @@ function start {
     else
         echo -e "Starting Valet DNS Watcher..."
         main
+        sleep 2 && echo $(pgrep -f 'inotifywait -q -m -e modify') > "${WORKDIR}/watch.pid"
         echo -e "Valet DNS Watcher started succesfully."
     fi
 }
@@ -164,7 +163,6 @@ function restart {
 }
 
 function status {
-    echo -e "Watching for changes in the following directories:\n"
     cat '/opt/valet-linux/watch.log'
 }
 

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,6 @@ function watchDirs() {`
`102`	`102`	`inotifywait -q -m -e modify -e create -e delete --format "%w%f" "${WATCHERS[@]}" \| while read change; do`
`103`	`103`	`updateNameservers`
`104`	`104`	`done &`
`105`		`-`
`106`		`- pgrep -f 'inotifywait -q -m -e modify' \| tee "${WORKDIR}/watch.pid" &>/dev/null`
`107`	`105`	`}`
`108`	`106`
`109`	`107`	`function main() {`
`@@ -131,6 +129,7 @@ function start {`
`131`	`129`	`else`
`132`	`130`	`echo -e "Starting Valet DNS Watcher..."`
`133`	`131`	`main`
	`132`	`+ sleep 2 && echo $(pgrep -f 'inotifywait -q -m -e modify') > "${WORKDIR}/watch.pid"`
`134`	`133`	`echo -e "Valet DNS Watcher started succesfully."`
`135`	`134`	`fi`
`136`	`135`	`}`
`@@ -164,7 +163,6 @@ function restart {`
`164`	`163`	`}`
`165`	`164`
`166`	`165`	`function status {`
`167`		`- echo -e "Watching for changes in the following directories:\n"`
`168`	`166`	`cat '/opt/valet-linux/watch.log'`
`169`	`167`	`}`
`170`	`168`