diff --git a/requirements.txt b/requirements.txt index 501e963..18d6d6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,13 @@ numpy==1.14.0 aiofiles # aiomultiprocess # aiosqlite -# asyncpg -# dataclasses # cached_property uvloop==0.9.1 -aiohttp==3.2.1 \ No newline at end of file +aiohttp==3.2.1 +# Someone forgot to add this in. +asyncpg +# Music cog requirements +opuslib +dataclasses +PyNaCl +youtube_dl diff --git a/sebi_machine_launcher.sh b/sebi_machine_launcher.sh index d5140a3..423d874 100644 --- a/sebi_machine_launcher.sh +++ b/sebi_machine_launcher.sh @@ -1,6 +1,13 @@ #!/bin/bash -until python -m src; do - echo "Sebi-Machine shutdown with error: $?. Restarting..." >&2 - sleep 1 +# 20th June 2018 +# Esp: added a trap here, as it otherwise attempts to restart when given +# the interrupt signal. This is really annoying over SSH when I have +# a 1-second lag anyway. +trap "echo 'Received interrupt. Exiting.'; exit 0" SIGINT +until python -m src; do + # Added colouring to ensure the date of shutdown and the exit code stands + # out from the other clutter in the traceback that might have been output. + echo -e "\e[0;31m[$(date --utc)]\e[0m Sebi-Machine shutdown with error \e[0;31m$?\e[0m. Restarting..." >&2 + sleep 1 done