2 Commits

2 changed files with 12 additions and 18 deletions
Unified View
  1. +0
    -1
      paircd/handler/privmsg.py
  2. +12
    -17
      paircd/main.py

+ 0
- 1
paircd/handler/privmsg.py View File

@ -4,7 +4,6 @@ from paircd.message import Message
from paircd.reply import ( from paircd.reply import (
ERR_NOSUCHNICK, ERR_NOSUCHNICK,
ERR_NOTEXTTOSEND, ERR_NOTEXTTOSEND,
ERR_NOTREGISTERED,
PRIVMSG, PRIVMSG,
RPL_AWAY, RPL_AWAY,
) )

+ 12
- 17
paircd/main.py View File

@ -1,18 +1,14 @@
import asyncio
from asyncio import create_task, run, start_server
from asyncio.streams import StreamReader, StreamWriter from asyncio.streams import StreamReader, StreamWriter
import logging
import os
from logging import basicConfig, info, INFO
from os import getenv
from paircd.client import Client from paircd.client import Client
from paircd.handlers import handle_cmd, register_cmd_handlers from paircd.handlers import handle_cmd, register_cmd_handlers
from paircd.message import parse_message from paircd.message import parse_message
from paircd.server import Server from paircd.server import Server
logging.basicConfig(
format="%(asctime)s [%(levelname)s] - %(message)s", level=logging.INFO
)
logger = logging.getLogger()
basicConfig(format="%(asctime)s [%(levelname)s] - %(message)s", level=INFO)
async def read_forever(server: Server, client: Client) -> None: async def read_forever(server: Server, client: Client) -> None:
@ -23,8 +19,8 @@ async def read_forever(server: Server, client: Client) -> None:
async def serve() -> None: async def serve() -> None:
bind_addr = os.getenv("BIND_ADDR") or "0.0.0.0"
port = os.getenv("PORT") or 6667
bind_addr = getenv("BIND_ADDR") or "0.0.0.0"
port = getenv("PORT") or 6667
irc_server = Server() irc_server = Server()
register_cmd_handlers() register_cmd_handlers()
@ -35,25 +31,24 @@ async def serve() -> None:
reader=reader, reader=reader,
writer=writer, writer=writer,
) )
asyncio.create_task(read_forever(irc_server, client))
asyncio.create_task(client.write_forever())
create_task(read_forever(irc_server, client))
create_task(client.write_forever())
server = await asyncio.start_server(
server = await start_server(
register_client, register_client,
bind_addr, bind_addr,
port, port,
reuse_port=True, reuse_port=True,
) )
logger.info(f"Listening on {bind_addr}:{port}")
info(f"Listening on {bind_addr}:{port}")
async with server: async with server:
await server.serve_forever() await server.serve_forever()
def main():
asyncio.run(serve())
def main() -> None:
run(serve())
if __name__ == "__main__": if __name__ == "__main__":
main() main()

Loading…
Cancel
Save