Merge 8a4693c into 437ec3b

fullstack/start.sh

@@ -27,12 +27,8 @@ set -euxo pipefail
 # Set up the filesystem.
 
 # Set up UUIDs to have a common race-free prefix.
-UUID_DIR=/var/local/uuid
-UUID_FILE=${UUID_DIR}/prefix
-mkdir -p "${UUID_DIR}"
-if [ ! -f "$UUID_FILE" ]; then
-    /create-uuid-prefix-file --filename="${UUID_FILE}"
-fi
+UUID_FILE=$(mktemp /tmp/uuidprefix.XXXXXX)
+/create-uuid-prefix-file --filename="${UUID_FILE}"
 
 # Set up the data directory.
 DATA_DIR=/var/spool/ndt
@@ -47,14 +43,20 @@ mkdir -p "${DATA_DIR}"/tcpinfo
   --prometheusx.listen-address=:9991 \
   --uuid-prefix-file="${UUID_FILE}" \
   --output="${DATA_DIR}"/tcpinfo \
+  --eventsocket=/var/local/tcpeventsocket.sock \
   &
 
+while [[ ! -e /var/local/tcpeventsocket.sock ]]; do
+  sleep 1
+done
+
 # Start the traceroute service.
 mkdir -p "${DATA_DIR}"/traceroute
 /traceroute-caller \
   --prometheusx.listen-address=:9992 \
   --uuid-prefix-file="${UUID_FILE}" \
   --outputPath="${DATA_DIR}"/traceroute \
+  --tcpinfo.socket=/var/local/tcpeventsocket.sock \
   &
 
 # TODO: Start the packet header capture service.