initial logging install
This commit is contained in:
@@ -7,6 +7,9 @@ from . import login
|
||||
from . import viewer as Viewer
|
||||
from .const import *
|
||||
|
||||
import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class SimpleBot(EventTarget):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
@@ -75,8 +78,11 @@ class SimpleBot(EventTarget):
|
||||
async def login(self, username, password):
|
||||
loginHandle = await login.Login(username, password, isBot = True)
|
||||
if loginHandle["login"] == False:
|
||||
logger.critical(f"Login failure: {loginHandle["message"]}")
|
||||
raise ValueError("Incorrect username or password")
|
||||
|
||||
logger.info(f"Login success: {loginHandle["message"]}")
|
||||
|
||||
await self.agent.login(loginHandle)
|
||||
|
||||
async def run(self):
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
import asyncio
|
||||
import struct
|
||||
|
||||
from ..eventtarget import EventTarget
|
||||
from .simulator import Simulator
|
||||
from . import messages
|
||||
import asyncio
|
||||
import struct
|
||||
|
||||
import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
sHandle = struct.Struct("<II")
|
||||
sIP = struct.Struct("<BBBB")
|
||||
@@ -19,6 +23,7 @@ class Agent(EventTarget):
|
||||
self.messageTemplate = messages.getDefaultTemplate()
|
||||
|
||||
async def addSimulator(self, handle, host, circuit, caps = None, parent = False):
|
||||
logger.debug(f"Connecting to {host} with circuit {circuit}")
|
||||
sim = Simulator(self)
|
||||
await sim.connect(host, circuit)
|
||||
self.simulators.append(sim)
|
||||
@@ -31,7 +36,6 @@ class Agent(EventTarget):
|
||||
|
||||
sim.on("message", self.handleMessage)
|
||||
sim.on("event", self.handleEvent)
|
||||
print("Connecting to", sim)
|
||||
return sim
|
||||
|
||||
def send(self, msg, reliable):
|
||||
@@ -57,7 +61,6 @@ class Agent(EventTarget):
|
||||
await self.fire("message", sim, msg)
|
||||
|
||||
async def handleEvent(self, sim, name, body):
|
||||
print(sim, name, body)
|
||||
if name == "EnableSimulator":
|
||||
simulatorInfo = body["SimulatorInfo"][0]
|
||||
handle = struct.unpack("<II", simulatorInfo["Handle"])
|
||||
@@ -111,6 +114,9 @@ class Agent(EventTarget):
|
||||
await simulator.fetchCapabilities(body["seed-capability"])
|
||||
break
|
||||
|
||||
else:
|
||||
logger.warning(f"Received EstablishAgentCommunication for unknown host {host}")
|
||||
|
||||
await self.fire("event", sim, name, body)
|
||||
|
||||
async def login(self, login):
|
||||
|
||||
Reference in New Issue
Block a user