diff --git a/confluent_client/bin/nodediscover b/confluent_client/bin/nodediscover index 2e1092d1..7331b365 100755 --- a/confluent_client/bin/nodediscover +++ b/confluent_client/bin/nodediscover @@ -220,6 +220,8 @@ def list_discovery(options, session): if options.order.lower() == field.lower(): orderby = field if options.csv: + if orderby: + hsht csv.writer(sys.stdout).writerow(columns) else: outhandler = client.Tabulator(columns) diff --git a/confluent_server/confluent/firmwaremanager.py b/confluent_server/confluent/firmwaremanager.py index ca7524ea..6f819061 100644 --- a/confluent_server/confluent/firmwaremanager.py +++ b/confluent_server/confluent/firmwaremanager.py @@ -63,7 +63,7 @@ def execupdate(handler, filename, updateobj, type, owner, node): 'detail': errstr}) except Exception as e: if _tracelog is None: - _tracelog = log.logger('trace') + _tracelog = log.Logger('trace') _tracelog.log(traceback.format_exc(), ltype=log.DataTypes.event, event=log.Events.stacktrace) updateobj.handle_progress({'phase': 'error', 'progress': 0.0, 'detail': str(e)})