diff options
| author | Antoine A <> | 2023-01-24 13:31:49 +0100 |
|---|---|---|
| committer | Antoine A <> | 2023-01-24 13:32:49 +0100 |
| commit | 065a0d5ed7f17d512bafc4ba2b41321cd4905587 (patch) | |
| tree | 5f477d1315a3f9b957932ea5cd26da6dc3b3313c | |
| parent | a5767d94f785e27cce6d9f450997fe6c8d3ed883 (diff) | |
| download | depolymerization-065a0d5ed7f17d512bafc4ba2b41321cd4905587.tar.gz depolymerization-065a0d5ed7f17d512bafc4ba2b41321cd4905587.tar.bz2 depolymerization-065a0d5ed7f17d512bafc4ba2b41321cd4905587.zip | |
Fix logging
| -rw-r--r-- | common/src/log.rs | 2 | ||||
| -rwxr-xr-x | instrumentation/conf/bitcoin.conf | 2 | ||||
| -rwxr-xr-x | instrumentation/conf/taler_btc_lifetime.conf | 2 | ||||
| -rwxr-xr-x | script/prepare.sh | 18 |
4 files changed, 12 insertions, 12 deletions
diff --git a/common/src/log.rs b/common/src/log.rs index bb7c27e..3923266 100644 --- a/common/src/log.rs +++ b/common/src/log.rs @@ -26,7 +26,7 @@ fn custom_format( write!( w, "{} {} {}", - now.format("[year]-[month]-[day]T[hour]:[minute]:[second].[subsecond digits:6][offset_hour sign:mandatory][offset_minute]"), + now.format("%+"), record.level(), &record.args() ) diff --git a/instrumentation/conf/bitcoin.conf b/instrumentation/conf/bitcoin.conf index 74de105..12fd451 100755 --- a/instrumentation/conf/bitcoin.conf +++ b/instrumentation/conf/bitcoin.conf @@ -2,7 +2,7 @@ regtest=1 txindex=1 maxtxfee=0.01 fallbackfee=0.00000001 -rpcservertimeout=10 +rpcservertimeout=15 [regtest] port=8345 diff --git a/instrumentation/conf/taler_btc_lifetime.conf b/instrumentation/conf/taler_btc_lifetime.conf index 9b3977e..91274c8 100755 --- a/instrumentation/conf/taler_btc_lifetime.conf +++ b/instrumentation/conf/taler_btc_lifetime.conf @@ -10,5 +10,5 @@ PORT = 8060 PAYTO = payto://bitcoin/bcrt1qgkgxkjj27g3f7s87mcvjjsghay7gh34cx39prj CONFIRMATION = 3 HTTP_LIFETIME = 10 -WIRE_LIFETIME = 110 +WIRE_LIFETIME = 10 AUTH_METHOD = none
\ No newline at end of file diff --git a/script/prepare.sh b/script/prepare.sh index 5791065..137dff5 100755 --- a/script/prepare.sh +++ b/script/prepare.sh @@ -23,27 +23,27 @@ echo "Found version $PG_VER" echo "Ⅱ - Install bitcoind version 0.23" cd $DIR curl -L https://bitcoincore.org/bin/bitcoin-core-23.0/bitcoin-23.0-x86_64-linux-gnu.tar.gz -o btc.tar.gz +tar xvzf btc.tar.gz rm -rfv ~/bitcoin mkdir -pv ~/bitcoin -tar xvzf btc.tar.gz mv -v bitcoin-23.0/* ~/bitcoin echo "Ⅲ - Install Go Ethereum (Geth) v1.10.24" cd $DIR curl -L https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.10.24-972007a5.tar.gz -o geth.tar.gz +tar xvzf geth.tar.gz rm -rfv ~/geth mkdir -pv ~/geth -tar xvzf geth.tar.gz mv -v geth-alltools-linux-amd64-1.10.24-972007a5/* ~/geth -echo "Ⅳ - Install Core Lightning v22.11.1" +echo "Ⅳ - Install Lightning Network Daemon v0.15.5-beta" cd $DIR -curl -L https://github.com/ElementsProject/lightning/releases/download/v22.11.1/clightning-v22.11.1-Ubuntu-22.04.tar.xz -o clightning.tar.gz -tar xvf clightning.tar.gz -rm -rfv ~/clightning -mkdir -pv ~/clightning -mv -v usr/* ~/clightning +curl -L https://github.com/lightningnetwork/lnd/releases/download/v0.15.5-beta/lnd-linux-amd64-v0.15.5-beta.tar.gz -o lnd.tar.gz +tar xvzf lnd.tar.gz +rm -rfv ~/lnd +mkdir -pv ~/lnd +mv -v lnd-linux-amd64-v0.15.5-beta/* ~/lnd echo "Ⅴ - PATH" -echo "Add PATH=\"\$HOME/geth:\$HOME/bitcoin/bin:\$HOME/clightning/bin:/usr/lib/postgresql/$PG_VER/bin:\$PATH\" to your bash profile"
\ No newline at end of file +echo "Add PATH=\"\$HOME/geth:\$HOME/bitcoin/bin:\$HOME/lnd:/usr/lib/postgresql/$PG_VER/bin:\$PATH\" to your bash profile"
\ No newline at end of file |