Merge pull request #221 from guydavis/develop

Latest fixes and doc updates.

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.

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 \

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 \

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

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