Git-Mirrors/lxmf_messageboard
1
0
Fork 0
mirror of https://github.com/markqvist/lxmf_messageboard.git synced 2024-10-01 02:25:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update: announcements, get directory, reduce log output

Browse Source 
* Created announce_check function which will check if need to rebroadcast announcement (hard coded to every 30 minutes)
* Using os.getcwd now can get current directory so doesn't need hardcoded dir for storage/identity
* Reduced RNS.log printout
* Adjustable redis database
This commit is contained in:
chengtripp 2023-02-01 10:06:14 +00:00 committed by GitHub
parent 98aeda263c
commit c343ac170a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
messageboard.py
View File

@ -6,10 +6,11 @@ import shortuuid
import time import time
display_name = "SolarExpress Message Board" display_name = "SolarExpress Message Board"
configdir = "~/retic/" configdir = os.getcwd()
identitypath = configdir+"storage/identity" identitypath = configdir+"/storage/identity"
redis_db = 2
r = redis.Redis(db=2, decode_responses=True) r = redis.Redis(db=redis_db, decode_responses=True)
def setup_lxmf(): def setup_lxmf():
@ -94,10 +95,18 @@ def send_message(destination_hash, message_content):
# Send it # Send it
message_router.handle_outbound(lxm) message_router.handle_outbound(lxm)
def announce_check():
if r.exists('announce'):
RNS.log('Recent announcement', RNS.LOG_DEBUG)
else:
r.set('announce', 1)
r.expire('announce', 1800)
announce_now(local_lxmf_destination)
RNS.log('Announcement sent, expr set 1800 seconds', RNS.LOG_INFO)
# Start Reticulum and print out all the debug messages # Start Reticulum and print out all the debug messages
reticulum = RNS.Reticulum(loglevel=RNS.LOG_EXTREME) reticulum = RNS.Reticulum(loglevel=RNS.LOG_VERBOSE)
# Create a Identity. # Create a Identity.
current_identity = setup_lxmf() current_identity = setup_lxmf()
@ -117,17 +126,11 @@ message_router.register_delivery_callback(lxmf_delivery)
# Announce node properties # Announce node properties
RNS.log('LXMF Router ready to receive on: {}'.format(RNS.prettyhexrep(local_lxmf_destination.hash)), RNS.LOG_INFO) RNS.log('LXMF Router ready to receive on: {}'.format(RNS.prettyhexrep(local_lxmf_destination.hash)), RNS.LOG_INFO)
announce_check()
if r.exists('announce'):
RNS.log('Recent announcement', RNS.LOG_INFO)
else:
r.set('announce', 1)
r.expire('announce', 1800)
announce_now(local_lxmf_destination)
RNS.log('Announcement sent, expr set 1800 seconds', RNS.LOG_INFO)
while True: while True:
# Work through redis message queue
for i in range(0, r.llen('message_queue')): for i in range(0, r.llen('message_queue')):
message_id = r.lpop('message_queue') message_id = r.lpop('message_queue')
message = r.get(message_id) message = r.get(message_id)
@ -135,4 +138,9 @@ while True:
destination_hash = message_id.split('_')[0] destination_hash = message_id.split('_')[0]
RNS.log('{} {}'.format(destination_hash, message), RNS.LOG_INFO) RNS.log('{} {}'.format(destination_hash, message), RNS.LOG_INFO)
send_message(destination_hash, message) send_message(destination_hash, message)
# Check whether we need to make another announcement
announce_check()
#Sleep
time.sleep(10) time.sleep(10)