diff --git a/CHANGELOG.md b/CHANGELOG.md index 21a9b463..84e769e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. The format - Machinaris - Docker images now available for [Apple M1](https://github.com/guydavis/machinaris/issues/43) and [Raspberry Pi OS](https://github.com/guydavis/machinaris/issues/155) architectures. - Chiadog - Update to new v0.7.0 to [support for parsing partials and solo blocks](https://github.com/martomi/chiadog/pull/268). - Chia - Update to patch release of 1.2.3. See their [changelog for details](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.2.3). +- Flax - Update to version 0.1.1. See their [changelog for details](https://github.com/Flax-Network/flax-blockchain/releases/tag/0.1.1). - TrueNAS - Support for Machinaris deployment via helm chart. [Issue #78](https://github.com/guydavis/machinaris/issues/78) - Big thanks to @kmoore134 for this! - Machinaris - Daily Farming Summary now available on Farming page for both Chia and Flax. Add new plot type column. - Machinaris - Pools - Show each Pool's status including link to your pool provider. List pool point events on Summary page. diff --git a/scripts/dev/start-api.sh b/scripts/dev/start-api.sh index 7e222f16..db730e1f 100644 --- a/scripts/dev/start-api.sh +++ b/scripts/dev/start-api.sh @@ -11,16 +11,19 @@ cd /code/machinaris if [ $FLASK_ENV == "development" ]; then LOG_LEVEL='debug' + RELOAD='--reload' else LOG_LEVEL='info' + RELOAD='--preload' fi # To enable SSL, use the Chia self-signed cert #--certfile=/root/.chia/mainnet/config/ssl/ca/chia_ca.crt \ #--keyfile=/root/.chia/mainnet/config/ssl/ca/chia_ca.key \ -/chia-blockchain/venv/bin/gunicorn --reload \ - --bind 0.0.0.0:8927 --timeout 90 \ +/chia-blockchain/venv/bin/gunicorn ${RELOAD} \ + --bind 0.0.0.0:8927 \ + --timeout 90 \ --log-level=${LOG_LEVEL} \ --workers=2 \ --config api/gunicorn.conf.py \ diff --git a/scripts/dev/start-web.sh b/scripts/dev/start-web.sh index b1f0b099..1d119688 100644 --- a/scripts/dev/start-web.sh +++ b/scripts/dev/start-web.sh @@ -11,12 +11,13 @@ cd /code/machinaris if [ $FLASK_ENV == "development" ]; then LOG_LEVEL='debug' + RELOAD='--reload' else LOG_LEVEL='info' + RELOAD='--preload' fi -/chia-blockchain/venv/bin/gunicorn \ - --reload \ +/chia-blockchain/venv/bin/gunicorn ${RELOAD} \ --bind 0.0.0.0:8926 \ --timeout 90 \ --log-level=$LOG_LEVEL \ diff --git a/scripts/flaxdog_install.sh b/scripts/flaxdog_install.sh index 459b7a5e..b49d5aa5 100644 --- a/scripts/flaxdog_install.sh +++ b/scripts/flaxdog_install.sh @@ -9,6 +9,11 @@ cd / git clone https://github.com/langhorst/flaxdog.git +# Temporary patch for spam about partial proofs +# https://github.com/martomi/chiadog/issues/252#issuecomment-877416135 +#cd /flaxdog/src/flax_log/handlers/ +#sed -i 's/FoundProofs(),//g' harvester_activity_handler.py + cd /flax-blockchain/ # Chia-blockchain needs PyYAML=5.4.1 but Chiadog wants exactly 5.4 diff --git a/scripts/start_machinaris.sh b/scripts/start_machinaris.sh index 8257b864..38fc0bd2 100644 --- a/scripts/start_machinaris.sh +++ b/scripts/start_machinaris.sh @@ -53,7 +53,7 @@ then RELOAD='--reload' else LOG_LEVEL='info' - RELOAD='' + RELOAD='--preload' fi # Kill gunicorn if already running to allow restart