This commit is contained in:
Justin (shocknet) 2024-07-05 23:57:18 -04:00
parent 6c30914057
commit 9ea355d9e1

View file

@ -17,6 +17,7 @@ get_log_info() {
ls -1t ${LOG_DIR}/components/nostrMiddleware_*.log 2>/dev/null | head -n 1 ls -1t ${LOG_DIR}/components/nostrMiddleware_*.log 2>/dev/null | head -n 1
} }
# Echo "Waiting for build..." every 10 seconds until the unlocker log is available, with a 3-minute timeout
TIMEOUT=180 TIMEOUT=180
while [ ! -f ${LOG_DIR}/components/unlocker_*.log ] && [ $TIMEOUT -gt 0 ]; do while [ ! -f ${LOG_DIR}/components/unlocker_*.log ] && [ $TIMEOUT -gt 0 ]; do
echo "Waiting for build..." echo "Waiting for build..."
@ -28,8 +29,12 @@ get_log_info() {
exit 1 exit 1
fi fi
# Wait for wallet status messages with a 45s timeout
TIMEOUT=45 TIMEOUT=45
while ! grep -q -e "unlocker >> macaroon not found, creating wallet..." -e "unlocker >> the wallet is already unlocked" -e "unlocker >> wallet is locked, unlocking" <(tail -n 0 -F ${LOG_DIR}/components/unlocker_*.log) && [ $TIMEOUT -gt 0 ]; do while [ $TIMEOUT -gt 0 ]; do
if grep -q -e "unlocker >> macaroon not found, creating wallet..." -e "unlocker >> the wallet is already unlocked" -e "unlocker >> wallet is locked, unlocking" ${LOG_DIR}/components/unlocker_*.log; then
break
fi
sleep 1 sleep 1
TIMEOUT=$((TIMEOUT - 1)) TIMEOUT=$((TIMEOUT - 1))
done done
@ -38,17 +43,20 @@ get_log_info() {
exit 1 exit 1
fi fi
if grep -q "unlocker >> macaroon not found, creating wallet..." <(tail -n 0 -F ${LOG_DIR}/components/unlocker_*.log); then if grep -q "unlocker >> macaroon not found, creating wallet..." ${LOG_DIR}/components/unlocker_*.log; then
echo "Creating wallet..." echo "Creating wallet..."
elif grep -q "unlocker >> wallet is locked, unlocking" <(tail -n 0 -F ${LOG_DIR}/components/unlocker_*.log); then elif grep -q "unlocker >> wallet is locked, unlocking" ${LOG_DIR}/components/unlocker_*.log; then
echo "Unlocking wallet..." echo "Unlocking wallet..."
else else
echo "Wallet is already unlocked." echo "Wallet is already unlocked."
fi fi
echo "Proceeding to nprofile attempts..."
while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
LATEST_LOG=$(find_latest_log) LATEST_LOG=$(find_latest_log)
if [ -n "$LATEST_LOG" ]; then if [ -n "$LATEST_LOG" ]; then
echo "Found latest log: $LATEST_LOG"
break break
fi fi
echo "Awaiting nostr information..." echo "Awaiting nostr information..."