Revision b53269fe flowspec/tasks.py

b/flowspec/tasks.py
22 22
        status = "ERROR"
23 23
    route.status = status
24 24
    route.response = response
25
    subtask(announce).delay("[%s] Route add: %s - Result: %s" %(route.applier, route.name, response), route.applier)
25
    subtask(announce).delay("[%s] Rule add: %s - Result: %s" %(route.applier, route.name, response), route.applier)
26 26
    route.save()
27 27

  
28 28
@task
......
36 36
    route.status = status
37 37
    route.response = response
38 38
    route.save()
39
    subtask(announce).delay("[%s] Route edit: %s - Result: %s"%(route.applier, route.name, response), route.applier)
39
    subtask(announce).delay("[%s] Rule edit: %s - Result: %s"%(route.applier, route.name, response), route.applier)
40 40

  
41 41

  
42 42

  
......
55 55
    route.status = status
56 56
    route.response = response
57 57
    route.save()
58
    subtask(announce).delay("[%s] Route removal: %s%s- Result %s" %(route.applier, route.name, reason_text, response), route.applier)
58
    subtask(announce).delay("[%s] Rule removal: %s%s- Result %s" %(route.applier, route.name, reason_text, response), route.applier)
59 59

  
60 60
# May not work in the first place... proxy is not aware of Route models
61 61
@task
......
81 81
            route.status = status
82 82
            route.response = response
83 83
            route.save()
84
            subtask(announce).delay("[%s] Route removal: %s%s- Result %s" %(route.applier, route.name, reason_text, response), route.applier)
84
            subtask(announce).delay("[%s] Rule removal: %s%s- Result %s" %(route.applier, route.name, reason_text, response), route.applier)
85 85
    else:
86 86
        return False
87 87

  
......
111 111
            subtask(delete).delay(route, reason="EXPIRED")
112 112
        elif route.has_expired() and (route.status == 'ADMININACTIVE' or route.status == 'INACTIVE'):
113 113
            route.status = 'EXPIRED'
114
            route.response = 'Route Expired'
114
            route.response = 'Rule Expired'
115 115
            route.save()
116 116
        else:
117 117
            if route.status != 'EXPIRED':

Also available in: Unified diff