mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-22 20:10:13 +00:00
simple_server: Make the server class loop-aware
First step in making the class able to manage its own state.
This commit is contained in:
parent
b8c1bd1fa3
commit
7b96b06752
1 changed files with 13 additions and 6 deletions
|
@ -20,7 +20,7 @@ import concurrent
|
||||||
|
|
||||||
class WebRTCSimpleServer(object):
|
class WebRTCSimpleServer(object):
|
||||||
|
|
||||||
def __init__(self, options):
|
def __init__(self, loop, options):
|
||||||
############### Global data ###############
|
############### Global data ###############
|
||||||
|
|
||||||
# Format: {uid: (Peer WebSocketServerProtocol,
|
# Format: {uid: (Peer WebSocketServerProtocol,
|
||||||
|
@ -35,6 +35,11 @@ class WebRTCSimpleServer(object):
|
||||||
# Room dict with a set of peers in each room
|
# Room dict with a set of peers in each room
|
||||||
self.rooms = dict()
|
self.rooms = dict()
|
||||||
|
|
||||||
|
# Event loop
|
||||||
|
self.loop = loop
|
||||||
|
# Websocket Server Instance
|
||||||
|
self.server = None
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
self.addr = options.addr
|
self.addr = options.addr
|
||||||
self.port = options.port
|
self.port = options.port
|
||||||
|
@ -266,7 +271,8 @@ class WebRTCSimpleServer(object):
|
||||||
logger.setLevel(logging.INFO)
|
logger.setLevel(logging.INFO)
|
||||||
logger.addHandler(logging.StreamHandler())
|
logger.addHandler(logging.StreamHandler())
|
||||||
|
|
||||||
return wsd
|
# Run the server
|
||||||
|
self.server = self.loop.run_until_complete(wsd)
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
|
parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
|
||||||
|
@ -282,9 +288,10 @@ def main():
|
||||||
|
|
||||||
loop = asyncio.get_event_loop()
|
loop = asyncio.get_event_loop()
|
||||||
|
|
||||||
r = WebRTCSimpleServer(options)
|
r = WebRTCSimpleServer(loop, options)
|
||||||
|
|
||||||
loop.run_until_complete (r.run())
|
print('Starting server...')
|
||||||
|
r.run()
|
||||||
loop.run_forever()
|
loop.run_forever()
|
||||||
print("Goodbye!")
|
print("Goodbye!")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue