Revision fdc3d663 flowspec/tasks.py

b/flowspec/tasks.py
121 121
        if route.has_expired() and (route.status != 'EXPIRED' and route.status != 'ADMININACTIVE' and route.status != 'INACTIVE'):
122 122
            logger.info('Expiring route %s' %route.name)
123 123
            subtask(delete).delay(route, reason="EXPIRED")
124
        elif route.has_expired() and (route.status == 'ADMININACTIVE' or route.status == 'INACTIVE'):
125
            route.status = 'EXPIRED'
126
            route.response = 'Rule Expired'
127
            logger.info('Expiring route %s' %route.name)
128
            route.save()
124
#        elif route.has_expired() and (route.status == 'ADMININACTIVE' or route.status == 'INACTIVE'):
125
#            route.status = 'EXPIRED'
126
#            route.response = 'Rule Expired'
127
#            logger.info('Expiring route %s' %route.name)
128
#            route.save()
129 129
        else:
130 130
            if route.status != 'EXPIRED':
131 131
                route.check_sync()

Also available in: Unified diff