From eb654ec963fbe7c3b3b0bb1c29733be65aeb2645 Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Wed, 2 Oct 2013 10:58:38 +1300 Subject: [PATCH] Fixed config reloader :) --- core/bot.py | 2 -- core/config.py | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/bot.py b/core/bot.py index 02d2706..524d79a 100644 --- a/core/bot.py +++ b/core/bot.py @@ -64,8 +64,6 @@ class Bot(object): # config self.config = self.get_config() self.logger.debug("Config object created.") - self.config.load_config() - self.logger.debug("Config loaded.") def get_config(self): diff --git a/core/config.py b/core/config.py index 3ace806..23640a2 100755 --- a/core/config.py +++ b/core/config.py @@ -32,15 +32,16 @@ class Config(dict): with open(self.path) as f: self.update(json.load(f)) - self.logger.info("Config loaded.") + self.logger.info("Config loaded from file.") def save_config(self): json.dump(self, open(self.path, 'w'), sort_keys=True, indent=2) - self.logger.info("Config saved.") + self.logger.info("Config saved to file.") def watcher(self): - event_handler = ConfigReloader(self, patterns=[self.filename]) + pattern = "*{}".format(self.filename) + event_handler = ConfigReloader(self, patterns=[pattern]) self.observer = Observer() self.observer.schedule(event_handler, path='.', @@ -49,7 +50,6 @@ class Config(dict): self.observer.start() - class ConfigReloader(Trick): def __init__(self, config, *args, **kwargs): self.config = config @@ -57,5 +57,5 @@ class ConfigReloader(Trick): Trick.__init__(self, *args, **kwargs) def on_any_event(self, event): - self.logger.info("Reloading config.") + self.logger.info("Config changed, triggering reload.") self.config.load_config()