mirror of
https://github.com/pablorevilla-meshtastic/meshview.git
synced 2026-08-12 03:42:57 +02:00
Cleaned up some print statements
This commit is contained in:
@@ -2,8 +2,6 @@ from meshview import models
|
|||||||
from sqlalchemy.ext.asyncio import async_sessionmaker
|
from sqlalchemy.ext.asyncio import async_sessionmaker
|
||||||
from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
|
from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
engine = None
|
engine = None
|
||||||
async_session = None
|
async_session = None
|
||||||
|
|
||||||
@@ -24,8 +22,6 @@ def init_database(database_connection_string, read_only=False):
|
|||||||
kwargs["pool_size"] = 20
|
kwargs["pool_size"] = 20
|
||||||
kwargs["max_overflow"] = 50
|
kwargs["max_overflow"] = 50
|
||||||
|
|
||||||
print("Database connection settings:", kwargs) # Debugging output
|
|
||||||
|
|
||||||
engine = create_async_engine(database_connection_string, **kwargs)
|
engine = create_async_engine(database_connection_string, **kwargs)
|
||||||
async_session = async_sessionmaker( bind=engine,
|
async_session = async_sessionmaker( bind=engine,
|
||||||
class_=AsyncSession,
|
class_=AsyncSession,
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ def init_database(database_connection_string):
|
|||||||
if not database_connection_string.startswith('sqlite'):
|
if not database_connection_string.startswith('sqlite'):
|
||||||
kwargs['pool_size'] = 20
|
kwargs['pool_size'] = 20
|
||||||
kwargs['max_overflow'] = 50
|
kwargs['max_overflow'] = 50
|
||||||
print (**kwargs)
|
|
||||||
engine = create_async_engine(database_connection_string, echo=False, connect_args={"timeout": 15})
|
engine = create_async_engine(database_connection_string, echo=False, connect_args={"timeout": 15})
|
||||||
async_session = async_sessionmaker(engine, expire_on_commit=False)
|
async_session = async_sessionmaker(engine, expire_on_commit=False)
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ async def get_topic_envelopes(mqtt_server, mqtt_port, topics, mqtt_user, mqtt_pa
|
|||||||
mqtt_server, port=mqtt_port , username=mqtt_user, password=mqtt_passwd , identifier=identifier,
|
mqtt_server, port=mqtt_port , username=mqtt_user, password=mqtt_passwd , identifier=identifier,
|
||||||
) as client:
|
) as client:
|
||||||
for topic in topics:
|
for topic in topics:
|
||||||
print(topic)
|
|
||||||
await client.subscribe(topic)
|
await client.subscribe(topic)
|
||||||
async for msg in client.messages:
|
async for msg in client.messages:
|
||||||
try:
|
try:
|
||||||
|
|||||||
+2
-8
@@ -24,7 +24,7 @@ from aiohttp import web
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
SEQ_REGEX = re.compile(r"seq \d+")
|
SEQ_REGEX = re.compile(r"seq \d+")
|
||||||
SOFTWARE_RELEASE= "2.0.3"
|
SOFTWARE_RELEASE= "2.0.3.060325"
|
||||||
CONFIG = config.CONFIG
|
CONFIG = config.CONFIG
|
||||||
|
|
||||||
env = Environment(loader=PackageLoader("meshview"), autoescape=select_autoescape())
|
env = Environment(loader=PackageLoader("meshview"), autoescape=select_autoescape())
|
||||||
@@ -133,7 +133,7 @@ async def build_trace(node_id):
|
|||||||
async def build_neighbors(node_id):
|
async def build_neighbors(node_id):
|
||||||
packets = await store.get_packets_from(node_id, PortNum.NEIGHBORINFO_APP, limit=1)
|
packets = await store.get_packets_from(node_id, PortNum.NEIGHBORINFO_APP, limit=1)
|
||||||
packet = packets.first()
|
packet = packets.first()
|
||||||
print(packet)
|
|
||||||
if not packet:
|
if not packet:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
@@ -1001,11 +1001,8 @@ async def graph_network(request):
|
|||||||
async def nodelist(request):
|
async def nodelist(request):
|
||||||
try:
|
try:
|
||||||
role = request.query.get("role")
|
role = request.query.get("role")
|
||||||
#print(role)
|
|
||||||
channel = request.query.get("channel")
|
channel = request.query.get("channel")
|
||||||
#print(channel)
|
|
||||||
hw_model = request.query.get("hw_model")
|
hw_model = request.query.get("hw_model")
|
||||||
#print(hw_model)
|
|
||||||
nodes= await store.get_nodes(role,channel, hw_model, days_active=3)
|
nodes= await store.get_nodes(role,channel, hw_model, days_active=3)
|
||||||
template = env.get_template("nodelist.html")
|
template = env.get_template("nodelist.html")
|
||||||
return web.Response(
|
return web.Response(
|
||||||
@@ -1145,8 +1142,6 @@ async def map(request):
|
|||||||
content_type="text/html",
|
content_type="text/html",
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
return web.Response(
|
return web.Response(
|
||||||
text="An error occurred while processing your request.",
|
text="An error occurred while processing your request.",
|
||||||
status=500,
|
status=500,
|
||||||
@@ -1214,7 +1209,6 @@ async def chat(request):
|
|||||||
filtered_packets = [
|
filtered_packets = [
|
||||||
p for p in ui_packets if not re.fullmatch(r"seq \d+", p.payload)
|
p for p in ui_packets if not re.fullmatch(r"seq \d+", p.payload)
|
||||||
]
|
]
|
||||||
#print("Example packet:", filtered_packets)
|
|
||||||
template = env.get_template("chat.html")
|
template = env.get_template("chat.html")
|
||||||
return web.Response(
|
return web.Response(
|
||||||
text=template.render(packets=filtered_packets, site_config=CONFIG),
|
text=template.render(packets=filtered_packets, site_config=CONFIG),
|
||||||
|
|||||||
Reference in New Issue
Block a user