change ctrl-c after clearing filters
@@ -752,9 +752,6 @@ class Monitor(object):
def signal_handler(self, signal, frame):
''' hopefully eat a CTRL_C and signal system shutdown '''
global CTRL_C
- CTRL_C['STOP'] = True
- self.logger.debug('CTRL-C: {0}'.format(CTRL_C))
- self.logger.debug('sdnc {0}'.format(self.s.sdnc))
if isinstance(self.s.sdnc, FaucetProxy):
Parser().clear_mirrors(self.controller['CONFIG_FILE'])
elif isinstance(self.s.sdnc, BcfProxy):
@@ -762,6 +759,8 @@ class Monitor(object):
retval = self.s.sdnc.remove_filter_rules()
self.logger.debug('removed filter rules: {0}'.format(retval))
+ CTRL_C['STOP'] = True
+ self.logger.debug('CTRL-C: {0}'.format(CTRL_C))
try:
for job in self.schedule.jobs:
self.logger.debug('CTRLC:{0}'.format(job))
