Commit ac7de5ed authored by Stavros Sachtouris's avatar Stavros Sachtouris Committed by Giorgos Korfiatis

Stop CLI from removing LOG_DATA,LOG_TOKEN flags

parent 70cff148
......@@ -202,19 +202,19 @@ class CommandInit(object):
if not self.client:
return
try:
self.client.LOG_TOKEN = (
self.client.LOG_TOKEN = self.client.LOG_TOKEN or (
self['config'].get('global', 'log_token').lower() == 'on')
except Exception as e:
log.debug('Failed to read custom log_token setting:'
'%s\n default for log_token is off' % e)
try:
self.client.LOG_DATA = (
self.client.LOG_DATA = self.client.LOG_DATA or (
self['config'].get('global', 'log_data').lower() == 'on')
except Exception as e:
log.debug('Failed to read custom log_data setting:'
'%s\n default for log_data is off' % e)
try:
self.client.LOG_PID = (
self.client.LOG_PID = self.client.LOG_PID or (
self['config'].get('global', 'log_pid').lower() == 'on')
except Exception as e:
log.debug('Failed to read custom log_pid setting:'
......
......@@ -355,8 +355,8 @@ class AllocationPoolArgument(RepeatableArgument):
if not (start and comma and end):
raise CLIInvalidArgument(
'Invalid allocation pool argument %s' % pool, details=[
'Allocation values must be of the form:',
' <start address>,<end address>'])
'Allocation values must be of the form:',
' <start address>,<end address>'])
new_list.append(dict(start=start, end=end))
self._value = new_list
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment