diff options
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/__init__.py | 2 | ||||
| -rw-r--r-- | ipalib/constants.py | 32 | ||||
| -rw-r--r-- | ipalib/crud.py | 2 | ||||
| -rw-r--r-- | ipalib/frontend.py | 15 | ||||
| -rw-r--r-- | ipalib/plugable.py | 12 | ||||
| -rw-r--r-- | ipalib/plugins/f_user.py | 4 |
6 files changed, 31 insertions, 36 deletions
diff --git a/ipalib/__init__.py b/ipalib/__init__.py index aa0f66cc4..0f9f54970 100644 --- a/ipalib/__init__.py +++ b/ipalib/__init__.py @@ -701,7 +701,7 @@ plugin (or plugins) is imported. For example: 1 >>> api.bootstrap(in_server=True) # We want to execute, not forward >>> len(api.env) -35 +32 `Env._bootstrap()`, which is called by `API.bootstrap()`, will create several run-time variables that connot be overriden in configuration files or through diff --git a/ipalib/constants.py b/ipalib/constants.py index 5687c53e6..e229b466c 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -51,31 +51,20 @@ CLI_TAB = ' ' # Two spaces # The section to read in the config files, i.e. [global] CONFIG_SECTION = 'global' - -# Log format for console output -LOG_FORMAT_STDERR = ': '.join([ - '%(name)s', +# Log format for stderr: +FORMAT_STDERR = ': '.join([ + 'ipa', '%(levelname)s', '%(message)s', ]) - -# Log format for console output when env.dubug is True: -LOG_FORMAT_STDERR_DEBUG = ' '.join([ - '%(levelname)s', - '%(message)r', - '%(lineno)d', - '%(filename)s', -]) - - -# Tab-delimited log format for file (easy to opened in a spreadsheet): -LOG_FORMAT_FILE = '\t'.join([ - '%(asctime)s', +# Log format for log file: +FORMAT_FILE = '\t'.join([ + '%(created)f', '%(levelname)s', '%(message)r', # Using %r for repr() so message is a single line - '%(lineno)d', - '%(pathname)s', + '%(process)d', + '%(threadName)s', ]) @@ -110,11 +99,6 @@ DEFAULT_CONFIG = ( ('debug', False), ('mode', 'production'), - # Logging: - ('log_format_stderr', LOG_FORMAT_STDERR), - ('log_format_stderr_debug', LOG_FORMAT_STDERR_DEBUG), - ('log_format_file', LOG_FORMAT_FILE), - # ******************************************************** # The remaining keys are never set from the values here! # ******************************************************** diff --git a/ipalib/crud.py b/ipalib/crud.py index bf33b7ab4..5bae4fbc3 100644 --- a/ipalib/crud.py +++ b/ipalib/crud.py @@ -85,7 +85,7 @@ class PKQuery(frontend.Method): """ def get_args(self): - yield self.obj.primary_key.clone(query=True, multivalue=True) + yield self.obj.primary_key.clone(query=True) class Retrieve(PKQuery): diff --git a/ipalib/frontend.py b/ipalib/frontend.py index 640b01f92..67f0a89c2 100644 --- a/ipalib/frontend.py +++ b/ipalib/frontend.py @@ -27,7 +27,7 @@ import plugable from plugable import lock, check_name import errors from errors import check_type, check_isinstance, raise_TypeError -from parameters import create_param, Param, Str, Flag +from parameters import create_param, Param, Str, Flag, Password from util import make_repr from errors2 import ZeroArgumentError, MaxArgumentError, OverlapError @@ -102,6 +102,7 @@ class Command(plugable.Plugin): params.update(self.get_default(**params)) self.validate(**params) (args, options) = self.params_2_args_options(**params) + self.debug(make_repr(self.name, *args, **options)) result = self.run(*args, **options) self.debug('%s result: %r', self.name, result) return result @@ -447,6 +448,18 @@ class Object(plugable.Plugin): if 'Backend' in self.api and self.backend_name in self.api.Backend: self.backend = self.api.Backend[self.backend_name] + def params_minus(self, *names): + """ + Yield all Param whose name is not in ``names``. + """ + if len(names) == 1 and not isinstance(names[0], (Param, str)): + names = names[0] + minus = frozenset(names) + for param in self.params(): + if param.name in minus or param in minus: + continue + yield param + def get_dn(self, primary_key): """ Construct an LDAP DN from a primary_key. diff --git a/ipalib/plugable.py b/ipalib/plugable.py index b52db9008..1370d7f54 100644 --- a/ipalib/plugable.py +++ b/ipalib/plugable.py @@ -37,7 +37,7 @@ import errors2 from config import Env import util from base import ReadOnly, NameSpace, lock, islocked, check_name -from constants import DEFAULT_CONFIG +from constants import DEFAULT_CONFIG, FORMAT_STDERR, FORMAT_FILE class SetProxy(ReadOnly): @@ -562,7 +562,7 @@ class API(DictProxy): self.__doing('bootstrap') self.env._bootstrap(**overrides) self.env._finalize_core(**dict(DEFAULT_CONFIG)) - log = logging.getLogger('ipa') + log = logging.getLogger() object.__setattr__(self, 'log', log) if self.env.debug: log.setLevel(logging.DEBUG) @@ -571,20 +571,18 @@ class API(DictProxy): # Add stderr handler: stderr = logging.StreamHandler() - format = self.env.log_format_stderr if self.env.debug: - format = self.env.log_format_stderr_debug stderr.setLevel(logging.DEBUG) elif self.env.verbose: stderr.setLevel(logging.INFO) else: stderr.setLevel(logging.WARNING) - stderr.setFormatter(util.LogFormatter(format)) + stderr.setFormatter(util.LogFormatter(FORMAT_STDERR)) log.addHandler(stderr) # Add file handler: if self.env.mode in ('dummy', 'unit_test'): - return # But not if in unit-test mode + return # But not if in unit-test mode log_dir = path.dirname(self.env.log) if not path.isdir(log_dir): try: @@ -593,7 +591,7 @@ class API(DictProxy): log.warn('Could not create log_dir %r', log_dir) return handler = logging.FileHandler(self.env.log) - handler.setFormatter(util.LogFormatter(self.env.log_format_file)) + handler.setFormatter(util.LogFormatter(FORMAT_FILE)) if self.env.debug: handler.setLevel(logging.DEBUG) else: diff --git a/ipalib/plugins/f_user.py b/ipalib/plugins/f_user.py index 506ad14d0..f1134fb2a 100644 --- a/ipalib/plugins/f_user.py +++ b/ipalib/plugins/f_user.py @@ -183,10 +183,10 @@ class user_add(crud.Add): api.register(user_add) -class user_del(crud.Del): +class user_del(crud.Delete): 'Delete an existing user.' - def execute(self, uid, **kw): + def execute(self, uid): """Delete a user. Not to be confused with inactivate_user. This makes the entry go away completely. |