# HG changeset patch # User Sam Hart # Date 1207536023 14400 # Node ID f6e82d63546516b683f0a8fce5453ca4c5f46425 # Parent c5c785fec243829265d5a0de01b01199c83eddbc Make BaseScheme logger name determined by self.scheme_name, remove unneeded __init__ rewrite in local, and change Hive.init to match current documentation --- a/swarmlib/connect/schemes/base_scheme.py Sun Apr 06 22:20:27 2008 -0400 +++ b/swarmlib/connect/schemes/base_scheme.py Sun Apr 06 22:40:23 2008 -0400 @@ -25,11 +25,13 @@ from swarmlib.config import Config class BaseScheme(object): + scheme_name = 'Base' def __init__(self, parsed_url, config, log, force=False): self._parsed_url = parsed_url self._config = config self._force = force self._log = log + self._logger = log.get_logger(self.scheme_name) def get_config(self): """ --- a/swarmlib/connect/schemes/local.py Sun Apr 06 22:20:27 2008 -0400 +++ b/swarmlib/connect/schemes/local.py Sun Apr 06 22:40:23 2008 -0400 @@ -23,8 +23,4 @@ from swarmlib.connect.base_schema import BaseScheme class Local(BaseScheme): - def __init__(self, parsed_url, config, log, force=False): - self._parsed_url = parsed_url - self._config = config - self._force = force - self._logger = log.get_logger("Local") + scheme_name = 'Local' --- a/swarmlib/hive.py Sun Apr 06 22:20:27 2008 -0400 +++ b/swarmlib/hive.py Sun Apr 06 22:40:23 2008 -0400 @@ -60,7 +60,7 @@ self.force = force self._logger = log.get_logger("Hive") - def init(self, force=False, ): + def init_hive(self, force=False, ): """ Called when a new Hive is to be initialized """