Revision b77dcedb flowspec/tasks.py

b/flowspec/tasks.py
25 25
logger.addHandler(handler)
26 26

  
27 27

  
28
@task
28
@task(ignore_result=True)
29 29
def add(route, callback=None):
30 30
    applier = PR.Applier(route_object=route)
31 31
    commit, response = applier.apply()
......
35 35
        status = "ERROR"
36 36
    route.status = status
37 37
    route.response = response
38
    subtask(announce).delay("[%s] Rule add: %s - Result: %s" %(route.applier, route.name, response), route.applier)
39 38
    route.save()
39
    announce("[%s] Rule add: %s - Result: %s" %(route.applier, route.name, response), route.applier)
40 40

  
41
@task
41
@task(ignore_result=True)
42 42
def edit(route, callback=None):
43 43
    applier = PR.Applier(route_object=route)
44 44
    commit, response = applier.apply(operation="replace")
......
49 49
    route.status = status
50 50
    route.response = response
51 51
    route.save()
52
    subtask(announce).delay("[%s] Rule edit: %s - Result: %s"%(route.applier, route.name, response), route.applier)
52
    announce("[%s] Rule edit: %s - Result: %s"%(route.applier, route.name, response), route.applier)
53 53

  
54 54

  
55 55

  
56
@task
56
@task(ignore_result=True)
57 57
def delete(route, **kwargs):
58 58
    applier = PR.Applier(route_object=route)
59 59
    commit, response = applier.apply(operation="delete")
......
68 68
    route.status = status
69 69
    route.response = response
70 70
    route.save()
71
    subtask(announce).delay("[%s] Suspending rule : %s%s- Result %s" %(route.applier, route.name, reason_text, response), route.applier)
71
    announce("[%s] Suspending rule : %s%s- Result %s" %(route.applier, route.name, reason_text, response), route.applier)
72 72

  
73 73
# May not work in the first place... proxy is not aware of Route models
74 74
@task
......
95 95
            route.response = response
96 96
            route.expires = datetime.date.today()
97 97
            route.save()
98
            subtask(announce).delay("[%s] Rule removal: %s%s- Result %s" %(route.applier, route.name, reason_text, response), route.applier)
98
            announce("[%s] Rule removal: %s%s- Result %s" %(route.applier, route.name, reason_text, response), route.applier)
99 99
    else:
100 100
        return False
101 101

  
102
@task
102
#@task(ignore_result=True)
103 103
def announce(messg, user):
104 104
    messg = str(messg)
105 105
#    username = user.username

Also available in: Unified diff