Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2024-12-14 11:26:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add soft time limits to tasks

Browse Source
This commit is contained in:
Reckless_Satoshi 2023-05-10 12:07:28 -07:00
parent a5d0550100
commit 5728c66cca
No known key found for this signature in database
GPG Key ID: 9C4585B561315571
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
api/tasks.py
View File

@ -1,4 +1,5 @@
from celery import shared_task from celery import shared_task
from celery.exceptions import SoftTimeLimitExceeded
@shared_task(name="users_cleansing", time_limit=600) @shared_task(name="users_cleansing", time_limit=600)
@ -46,7 +47,7 @@ def users_cleansing():
return results return results
@shared_task(name="follow_send_payment", time_limit=180) @shared_task(name="follow_send_payment", time_limit=180, soft_time_limit=175)
def follow_send_payment(hash): def follow_send_payment(hash):
"""Sends sats to buyer, continuous update""" """Sends sats to buyer, continuous update"""
@ -68,8 +69,18 @@ def follow_send_payment(hash):
float(lnpayment.num_satoshis) * float(lnpayment.routing_budget_ppm) / 1_000_000 float(lnpayment.num_satoshis) * float(lnpayment.routing_budget_ppm) / 1_000_000
) )
timeout_seconds = config("PAYOUT_TIMEOUT_SECONDS", cast=int, default=90) timeout_seconds = config("PAYOUT_TIMEOUT_SECONDS", cast=int, default=90)
try:
results = LNNode.follow_send_payment(lnpayment, fee_limit_sat, timeout_seconds)
except SoftTimeLimitExceeded:
# If the 3 minutes have been consumed without follow_send_payment()
# finishing (failed/successful) we set the last routing time as 'now'
# so the next check happens in 3 minutes, instead of right now.
lnpayment.last_routing_time = timezone.now()
lnpayment.save(update_fields=["last_routing_time"])
print(f"Order: {lnpayment.order_paid_LN} SOFT TIME LIMIT REACHED. Hash: {hash}")
results = {}
results = LNNode.follow_send_payment(lnpayment, fee_limit_sat, timeout_seconds)
return results return results
@ -135,16 +146,28 @@ def payments_cleansing():
return results return results
@shared_task(name="cache_external_market_prices", ignore_result=True, time_limit=120) @shared_task(
name="cache_external_market_prices",
ignore_result=True,
time_limit=120,
soft_time_limit=115,
)
def cache_market(): def cache_market():
import math
from django.utils import timezone from django.utils import timezone
from .models import Currency from .models import Currency
from .utils import get_exchange_rates from .utils import get_exchange_rates
currency_codes = list(Currency.currency_dict.values()) currency_codes = list(Currency.currency_dict.values())
exchange_rates = get_exchange_rates(currency_codes)
try:
exchange_rates = get_exchange_rates(currency_codes)
except SoftTimeLimitExceeded:
print("SOFT LIMIT REACHED. Could not fetch current external market prices.")
return
results = {} results = {}
for i in range( for i in range(
@ -155,7 +178,7 @@ def cache_market():
results[i] = {currency_codes[i], rate} results[i] = {currency_codes[i], rate}
# Do not update if no new rate was found # Do not update if no new rate was found
if str(rate) == "nan": if math.isnan(rate):
continue continue
# Create / Update database cached prices # Create / Update database cached prices

3
api/utils.py
View File

@ -72,7 +72,7 @@ def validate_onchain_address(address):
market_cache = {} market_cache = {}
@ring.dict(market_cache, expire=3) # keeps in cache for 3 seconds @ring.dict(market_cache, expire=30) # keeps in cache for 30 seconds
def get_exchange_rates(currencies): def get_exchange_rates(currencies):
""" """
Params: list of currency codes. Params: list of currency codes.
@ -109,6 +109,7 @@ def get_exchange_rates(currencies):
yadio_rates.append(np.nan) yadio_rates.append(np.nan)
api_rates.append(yadio_rates) api_rates.append(yadio_rates)
except Exception: except Exception:
print(f"Could not fetch BTC prices from {api_url}")
pass pass
if len(api_rates) == 0: if len(api_rates) == 0: