File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -482,16 +482,18 @@ def tear_down_plugs(self):
482
482
self ._xmlrpc_server = None
483
483
484
484
_LOG .debug ('Tearing down all plugs.' )
485
- for a_plug in self ._plugs_by_type .values ():
486
- thread = _PlugTearDownThread (a_plug )
485
+ for plug_type , plug_instance in self ._plugs_by_type .items ():
486
+ thread = _PlugTearDownThread (plug_instance ,
487
+ name = '<PlugTearDownThread: %s>' % plug_type )
487
488
thread .start ()
488
489
timeout_s = (conf .plug_teardown_timeout_s
489
490
if conf .plug_teardown_timeout_s
490
491
else None )
491
492
thread .join (timeout_s )
492
493
if thread .is_alive ():
493
494
thread .kill ()
494
- _LOG .warning ('Killed tearDown for plug %s after timeout.' , a_plug )
495
+ _LOG .warning ('Killed tearDown for plug %s after timeout.' ,
496
+ plug_instance )
495
497
self ._plugs_by_type .clear ()
496
498
self ._plugs_by_name .clear ()
497
499
You can’t perform that action at this time.
0 commit comments