Fix exit on error (#51)

* Fix exit on error * Fix thread deamon * Update image versions
stakewise · Jan 31, 2022 · 2d30322 · 2d30322
1 parent e08d46a
commit 2d30322
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
@@ -21,7 +21,7 @@ volumes:
 services:
   oracle:
     container_name: oracle
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.1.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.1.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/oracle/main.py"]
@@ -30,7 +30,7 @@ services:
 
   keeper:
     container_name: keeper
-    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.1.0
+    image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.1.1
     restart: always
     entrypoint: ["python"]
     command: ["oracle/keeper/main.py"]

diff --git a/oracle/keeper/main.py b/oracle/keeper/main.py
@@ -60,6 +60,7 @@ def main() -> None:
         t = threading.Thread(
             target=start_health_server,
             args=(create_health_server_runner(keeper_routes),),
+            daemon=True,
         )
         t.start()
     main()
diff --git a/oracle/keeper/utils.py b/oracle/keeper/utils.py
@@ -221,7 +221,6 @@ def wait_for_transaction(tx_hash: HexBytes) -> None:
         current_block = web3_client.eth.block_number
 
 
-@backoff.on_exception(backoff.expo, Exception, max_time=900)
 def get_transaction_params() -> TxParams:
     account_nonce = web3_client.eth.getTransactionCount(web3_client.eth.default_account)
     latest_block = web3_client.eth.get_block("latest")

diff --git a/oracle/oracle/main.py b/oracle/oracle/main.py
@@ -135,6 +135,7 @@ async def main() -> None:
         t = threading.Thread(
             target=start_health_server,
             args=(create_health_server_runner(oracle_routes),),
+            daemon=True,
         )
         t.start()
     asyncio.run(main())