William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-24 14:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added init option for requiring existing shared instance

Browse Source
This commit is contained in:
Mark Qvist 2024-11-22 23:11:34 +01:00
parent 6f8d3e882a
commit f095b9cb8e
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RNS/Reticulum.py
View File

@ -184,7 +184,7 @@ class Reticulum:
""" """
return Reticulum.__instance return Reticulum.__instance
def __init__(self,configdir=None, loglevel=None, logdest=None, verbosity=None): def __init__(self,configdir=None, loglevel=None, logdest=None, verbosity=None, require_shared_instance=False):
""" """
Initialises and starts a Reticulum instance. This must be Initialises and starts a Reticulum instance. This must be
done before any other operations, and Reticulum will not done before any other operations, and Reticulum will not
@ -247,6 +247,7 @@ class Reticulum:
RNS.loglevel = self.requested_loglevel RNS.loglevel = self.requested_loglevel
self.is_shared_instance = False self.is_shared_instance = False
self.require_shared = require_shared_instance
self.is_connected_to_shared_instance = False self.is_connected_to_shared_instance = False
self.is_standalone_instance = False self.is_standalone_instance = False
self.jobs_thread = None self.jobs_thread = None
@ -334,8 +335,14 @@ class Reticulum:
interface.bitrate = Reticulum._force_shared_instance_bitrate interface.bitrate = Reticulum._force_shared_instance_bitrate
interface._force_bitrate = Reticulum._force_shared_instance_bitrate interface._force_bitrate = Reticulum._force_shared_instance_bitrate
RNS.log(f"Forcing shared instance bitrate of {RNS.prettyspeed(interface.bitrate)}", RNS.LOG_WARNING) RNS.log(f"Forcing shared instance bitrate of {RNS.prettyspeed(interface.bitrate)}", RNS.LOG_WARNING)
RNS.Transport.interfaces.append(interface)
if self.require_shared == True:
interface.detach()
self.is_shared_instance = True
RNS.log("Existing shared instance required, but this instance started as shared instance. Aborting startup.", RNS.LOG_VERBOSE)
else:
RNS.Transport.interfaces.append(interface)
self.is_shared_instance = True self.is_shared_instance = True
RNS.log("Started shared instance interface: "+str(interface), RNS.LOG_DEBUG) RNS.log("Started shared instance interface: "+str(interface), RNS.LOG_DEBUG)
self.__start_jobs() self.__start_jobs()
@ -366,6 +373,10 @@ class Reticulum:
self.is_shared_instance = False self.is_shared_instance = False
self.is_standalone_instance = True self.is_standalone_instance = True
self.is_connected_to_shared_instance = False self.is_connected_to_shared_instance = False
if self.is_shared_instance and self.require_shared:
raise SystemError("No shared instance available, but application that started Reticulum required it")
else: else:
self.is_shared_instance = False self.is_shared_instance = False
self.is_standalone_instance = True self.is_standalone_instance = True