burrow-bsbd: Removed surplus newline

[home-hw.git] / telegram / burrow-telegram.py

diff --git a/telegram/burrow-telegram.py b/telegram/burrow-telegram.py
index 608fd119466ec59e3fe8e0754f6781f3cf2f626c..be093b9e34a719f172df0627bc4867f4a80aba5d 100755 (executable)
--- a/telegram/burrow-telegram.py
+++ b/telegram/burrow-telegram.py
@@ -8,6 +8,7 @@ import asyncio_mqtt
 from configparser import ConfigParser
 from datetime import datetime, timedelta
 import logging
+from logging.handlers import SysLogHandler
 import signal
 import ssl
 import sys
@@ -15,10 +16,16 @@ import sys
 config = ConfigParser()
 config.read('/usr/local/etc/burrow-telegram')
 API_TOKEN = config['telegram']['api_token']
-CHATS = map(int, config['telegram']['chats'].split(' '))
-
-formatter = logging.Formatter(fmt="%(asctime)s %(name)s.%(levelname)s: %(message)s", datefmt='%Y-%m-%d %H:%M:%S')
-log_handler = logging.StreamHandler(stream=sys.stdout)
+CHATS = list(map(int, config['telegram']['chats'].split(' ')))
+USE_SYSLOG = True
+
+if USE_SYSLOG:
+    formatter = logging.Formatter(fmt="%(message)s")        # systemd will handle the rest
+    log_handler = SysLogHandler('/dev/log', facility=SysLogHandler.LOG_LOCAL1)
+    log_handler.ident = 'burrow-telegram: '
+else:
+    formatter = logging.Formatter(fmt="%(asctime)s %(name)s.%(levelname)s: %(message)s", datefmt='%Y-%m-%d %H:%M:%S')
+    log_handler = logging.StreamHandler(stream=sys.stdout)
 log_handler.setFormatter(formatter)
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
@@ -37,6 +44,8 @@ async def send_welcome(message: types.Message):
 @dispatcher.message_handler()
 async def echo(message: types.Message):
     print(message)
+    if message.text.startswith("xyzzy"):
+        await send_msg("Nothing happens.")
     # await message.answer(message.text)
 
 
@@ -143,14 +152,13 @@ async def mqtt_watcher():
             await mqtt_loop()
         except asyncio_mqtt.MqttError as error:
             logger.error(f"MQTT error: {error}")
-        finally:
-            await asyncio.sleep(10)
+        await asyncio.sleep(10)
 
 
 async def fortunes():
     await asyncio.sleep(5*60)
     while True:
-        proc = await asyncio.create_subprocess_exec('fortune', stdout=asyncio.subprocess.PIPE)
+        proc = await asyncio.create_subprocess_exec('/usr/games/fortune', stdout=asyncio.subprocess.PIPE)
         out, err = await proc.communicate()
         if proc.returncode == 0:
             await send_msg(out.decode())
@@ -161,10 +169,14 @@ async def fortunes():
 
 async def main():
     loop = asyncio.get_event_loop()
-    t1 = loop.create_task(mqtt_watcher())
-    t2 = loop.create_task(dispatcher.start_polling(timeout=20, relax=0.01, fast=True, allowed_updates=None))
-    t3 = loop.create_task(fortunes())
-    await asyncio.wait((t1, t2, t3))
+    coros = [
+        loop.create_task(mqtt_watcher()),
+        loop.create_task(dispatcher.start_polling(timeout=60, relax=0.01, fast=True, allowed_updates=None)),
+        loop.create_task(fortunes()),
+    ]
+    for coro in asyncio.as_completed(coros):
+        done = await coro
+        done.result()       # The coroutine probably died of an exception, which is raised here.
 
 
 asyncio.run(main())