Jerry/pacroller
1
0
Fork 0
mirror of https://github.com/isjerryxiao/pacroller.git synced 2024-11-22 07:40:43 +08:00
Code Issues Projects Releases Packages Wiki Activity

add test-smtp command

Browse source
This commit is contained in:
JerryXiao 2021-07-02 18:47:20 +08:00
parent c9fb39c42c
commit 2a716bef60
Signed by: Jerry
GPG key ID: 22618F758B5BE2E5
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/pacroller/config.py
View file

@ -24,7 +24,12 @@ else:
_config = dict() _config = dict()
if (smtp_cfg := (CONFIG_DIR / CONFIG_FILE_SMTP)).exists(): if (smtp_cfg := (CONFIG_DIR / CONFIG_FILE_SMTP)).exists():
_smtp_config: dict = json.loads(smtp_cfg.read_text()) try:
_smtp_cfg_text = smtp_cfg.read_text()
except PermissionError:
_smtp_config = dict()
else:
_smtp_config: dict = json.loads(_smtp_cfg_text)
else: else:
_smtp_config = dict() _smtp_config = dict()

6
src/pacroller/mailer.py
View file

@ -17,9 +17,9 @@ class MailSender:
self.mailfrom = SMTP_FROM self.mailfrom = SMTP_FROM
self.mailto = SMTP_TO.split() self.mailto = SMTP_TO.split()
self.smtp_cls = smtplib.SMTP_SSL if self.ssl else smtplib.SMTP self.smtp_cls = smtplib.SMTP_SSL if self.ssl else smtplib.SMTP
def send_text_plain(self, text: str, subject: str = f"pacroller from {hostname}", mailto: List[str] = list()) -> None: def send_text_plain(self, text: str, subject: str = f"pacroller on {hostname}", mailto: List[str] = list()) -> bool:
if not SMTP_ENABLED: if not SMTP_ENABLED:
return return None
for _ in range(NETWORK_RETRY): for _ in range(NETWORK_RETRY):
try: try:
server = self.smtp_cls(self.host, self.port) server = self.smtp_cls(self.host, self.port)
@ -40,6 +40,8 @@ class MailSender:
break break
else: else:
logger.error(f"unable to send email after {NETWORK_RETRY} attempts {text=}") logger.error(f"unable to send email after {NETWORK_RETRY} attempts {text=}")
return False
return True
if __name__ == "__main__": if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(module)s - %(funcName)s - %(levelname)s - %(message)s') logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(module)s - %(funcName)s - %(levelname)s - %(message)s')

13
src/pacroller/main.py
View file

@ -264,8 +264,8 @@ def main() -> None:
logger.debug(f'needrestart {p.stdout=}') logger.debug(f'needrestart {p.stdout=}')
import argparse import argparse
parser = argparse.ArgumentParser(description='Unattended Upgrades for Arch Linux') parser = argparse.ArgumentParser(description='Unattended Upgrades for Arch Linux')
parser.add_argument('action', choices=['run', 'status', 'reset', 'fail-reset', 'reset-failed'], parser.add_argument('action', choices=['run', 'status', 'reset', 'fail-reset', 'reset-failed', 'test-smtp'],
help="what to do", metavar="run / status / reset ") help="what to do", metavar="run / status / reset / test-smtp")
parser.add_argument('-d', '--debug', action='store_true', help='enable debug mode') parser.add_argument('-d', '--debug', action='store_true', help='enable debug mode')
parser.add_argument('-v', '--verbose', action='store_true', help='show verbose report') parser.add_argument('-v', '--verbose', action='store_true', help='show verbose report')
parser.add_argument('-m', '--max', type=int, default=1, help='Number of upgrades to show') parser.add_argument('-m', '--max', type=int, default=1, help='Number of upgrades to show')
@ -321,6 +321,15 @@ def main() -> None:
if PACMAN_SCC: if PACMAN_SCC:
clear_pkg_cache() clear_pkg_cache()
elif args.action == 'test-smtp':
logger.info('sending test mail...')
if _smtp_result := MailSender().send_text_plain("This is a test mail\nIf you see this email, your smtp config is working."):
logger.info("success")
elif _smtp_result is None:
logger.warning("smtp is disabled")
else:
logger.error("fail")
elif args.action == 'status': elif args.action == 'status':
count = 0 count = 0
failed = False failed = False