From 1f618b9773a37443188b5ada17bee0306d05cf92 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Mon, 18 Oct 2021 10:08:31 +0200 Subject: [PATCH] log: Fix support of 'supybot-test --clean' Broken in dff394df64b275833eba3b12f253f1e66c80db27. --- scripts/supybot-test | 1 + src/log.py | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/supybot-test b/scripts/supybot-test index d19ed2943..069b30ebd 100644 --- a/scripts/supybot-test +++ b/scripts/supybot-test @@ -234,6 +234,7 @@ if __name__ == '__main__': print('Testing began at %s (pid %s)' % (time.ctime(), os.getpid())) if options.clean: shutil.rmtree(conf.supybot.directories.log()) + log._mkDirs() shutil.rmtree(conf.supybot.directories.conf()) shutil.rmtree(conf.supybot.directories.data()) result = runner.run(suite) diff --git a/src/log.py b/src/log.py index 65d774d6b..d56cd1062 100644 --- a/src/log.py +++ b/src/log.py @@ -176,14 +176,18 @@ class ColorizedFormatter(Formatter): else: return Formatter.format(self, record, *args, **kwargs) -_logDir = conf.supybot.directories.log() -if not os.path.exists(_logDir): - os.mkdir(_logDir, 0o755) +def _mkDirs(): + global _logDir, pluginLogDir + _logDir = conf.supybot.directories.log() + if not os.path.exists(_logDir): + os.mkdir(_logDir, 0o755) -pluginLogDir = os.path.join(_logDir, 'plugins') + pluginLogDir = os.path.join(_logDir, 'plugins') -if not os.path.exists(pluginLogDir): - os.mkdir(pluginLogDir, 0o755) + if not os.path.exists(pluginLogDir): + os.mkdir(pluginLogDir, 0o755) + +_mkDirs() try: messagesLogFilename = os.path.join(_logDir, 'messages.log')