Skip to content
Snippets Groups Projects
Commit 0aa83798 authored by KERDREUX Jerome's avatar KERDREUX Jerome
Browse files

Fix the web app not starting 

Once again, Py changed the asyncio API. It takes me a while to figure
out why this simple piece of code doesn't work.

In fact, if not provided aiohttp create another loop.
parent cfb24b52
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
libs/monitor/tests/test_aiohttp.py
+ 17
− 9
View file @ 0aa83798
...@@ -5,10 +5,9 @@ Open http://localhost:4444/ ...@@ -5,10 +5,9 @@ Open http://localhost:4444/
""" """
from aiohttp import web from aiohttp import web
import asyncio
import platform import platform
from xaal.lib.asyncio import AsyncEngine from xaal.lib import AsyncEngine
from xaal.lib import helpers,tools from xaal.lib import helpers, tools
from xaal.monitor import Monitor from xaal.monitor import Monitor
from xaal.schemas import devices from xaal.schemas import devices
...@@ -16,27 +15,35 @@ PORT = 4444 ...@@ -16,27 +15,35 @@ PORT = 4444
mon = None mon = None
routes = web.RouteTableDef() routes = web.RouteTableDef()
@routes.get('/') @routes.get('/')
async def dev_list(request): async def dev_list(request):
assert mon is not None
r = '<ul>' r = '<ul>'
for dev in mon.devices: for dev in mon.devices:
r = r+ f'<li><a href="/devices/{dev.address}"><tt>{dev.address}</tt></a> {dev.dev_type}</li>' r = r + f'<li><a href="/devices/{dev.address}"><tt>{dev.address}</tt></a> {dev.dev_type}</li>'
r = r+'<ul>' r = r + '<ul>'
return html("Devices list<br>%s" % r) return html("Devices list<br>%s" % r)
@routes.get('/devices/{addr}') @routes.get('/devices/{addr}')
async def dev_info(request): async def dev_info(request):
assert mon is not None
addr = tools.get_uuid(request.match_info['addr']) addr = tools.get_uuid(request.match_info['addr'])
dev = mon.devices.get_with_addr(addr) dev = mon.devices.get_with_addr(addr)
r = '' r = ''
if dev: if dev:
return html(f"<h1>Device: {dev.address} / {dev.dev_type}</h1> <h2>Attributes</h2><pre>{dev.attributes}</pre> <h2>Description</h2><pre>{dev.description}</pre>") return html(
f"<h1>Device: {dev.address} / {dev.dev_type}</h1> <h2>Attributes</h2><pre>{dev.attributes}</pre> <h2>Description</h2><pre>{dev.description}</pre>"
)
else: else:
return html('device not found') return html('device not found')
def html(content): def html(content):
content = f'<html><body>\n{content}\n</body></html>' content = f'<html><body>\n{content}\n</body></html>'
return web.Response(text=content,content_type='text/html') return web.Response(text=content, content_type='text/html')
# setup log & Engine # setup log & Engine
helpers.setup_console_logger() helpers.setup_console_logger()
...@@ -50,9 +57,10 @@ eng.add_device(dev) ...@@ -50,9 +57,10 @@ eng.add_device(dev)
# Let's start # Let's start
mon = Monitor(dev) mon = Monitor(dev)
asyncio.ensure_future(eng.run()) eng.start()
# eng.get_loop().set_debug(True)
# Web apps.. # Web apps..
app = web.Application() app = web.Application()
app.add_routes(routes) app.add_routes(routes)
web.run_app(app, port=PORT) web.run_app(app, port=PORT, loop=eng.get_loop())
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment