Revision 57de574d
b/flowspec/tasks.py | ||
---|---|---|
7 | 7 |
from flowspy.utils import beanstalkc |
8 | 8 |
from django.conf import settings |
9 | 9 |
|
10 |
FORMAT = '%(asctime)s %(levelname)s: %(message)s' |
|
11 |
logging.basicConfig(format=FORMAT) |
|
10 |
import os |
|
11 |
|
|
12 |
cwd = os.getcwd() |
|
13 |
|
|
14 |
LOG_FILENAME = os.path.join(cwd, 'log/celery_jobs.log') |
|
15 |
|
|
16 |
#FORMAT = '%(asctime)s %(levelname)s: %(message)s' |
|
17 |
#logging.basicConfig(format=FORMAT) |
|
18 |
formatter = logging.Formatter('%(asctime)s %(levelname)s: %(message)s') |
|
19 |
|
|
12 | 20 |
logger = logging.getLogger(__name__) |
13 | 21 |
logger.setLevel(logging.DEBUG) |
22 |
handler = logging.FileHandler(LOG_FILENAME) |
|
23 |
handler.setFormatter(formatter) |
|
24 |
logger.addHandler(handler) |
|
25 |
|
|
14 | 26 |
|
15 | 27 |
@task |
16 | 28 |
def add(route, callback=None): |
... | ... | |
112 | 124 |
elif route.has_expired() and (route.status == 'ADMININACTIVE' or route.status == 'INACTIVE'): |
113 | 125 |
route.status = 'EXPIRED' |
114 | 126 |
route.response = 'Rule Expired' |
127 |
logger.info('Expiring route %s' %route.name) |
|
115 | 128 |
route.save() |
116 | 129 |
else: |
117 | 130 |
if route.status != 'EXPIRED': |
b/flowspec/views.py | ||
---|---|---|
32 | 32 |
from django.conf import settings |
33 | 33 |
from django.core.mail import mail_admins, mail_managers, send_mail |
34 | 34 |
|
35 |
import os |
|
36 |
|
|
37 |
cwd = os.getcwd() |
|
38 |
|
|
39 |
|
|
40 |
LOG_FILENAME = os.path.join(cwd, 'log/celery_jobs.log') |
|
41 |
|
|
42 |
#FORMAT = '%(asctime)s %(levelname)s: %(message)s' |
|
43 |
#logging.basicConfig(format=FORMAT) |
|
44 |
formatter = logging.Formatter('%(asctime)s %(levelname)s: %(message)s') |
|
45 |
|
|
46 |
logger = logging.getLogger(__name__) |
|
47 |
logger.setLevel(logging.DEBUG) |
|
48 |
handler = logging.FileHandler(LOG_FILENAME) |
|
49 |
handler.setFormatter(formatter) |
|
50 |
logger.addHandler(handler) |
|
51 |
|
|
52 |
|
|
35 | 53 |
|
36 | 54 |
@login_required |
37 | 55 |
def user_routes(request): |
... | ... | |
82 | 100 |
{"route": route}) |
83 | 101 |
mail_admins("Rule %s creation request submitted by %s" %(route.name, route.applier.username), |
84 | 102 |
mail_body, fail_silently=True) |
103 |
logger.info(mail_body) |
|
85 | 104 |
return HttpResponseRedirect(reverse("group-routes")) |
86 | 105 |
else: |
87 | 106 |
return render_to_response('apply.html', {'form': form, 'applier':applier}, |
... | ... | |
125 | 144 |
{"route": route}) |
126 | 145 |
mail_admins("Rule %s edit request submitted by %s" %(route.name, route.applier.username), |
127 | 146 |
mail_body, fail_silently=True) |
147 |
logger.info(mail_body) |
|
128 | 148 |
return HttpResponseRedirect(reverse("group-routes")) |
129 | 149 |
else: |
130 | 150 |
return render_to_response('apply.html', {'form': form, 'edit':True, 'applier': applier}, |
... | ... | |
151 | 171 |
{"route": route}) |
152 | 172 |
mail_admins("Rule %s removal request submitted by %s" %(route.name, route.applier.username), |
153 | 173 |
mail_body, fail_silently=True) |
174 |
logger.info(mail_body) |
|
154 | 175 |
html = "<html><body>Done</body></html>" |
155 | 176 |
return HttpResponse(html) |
156 | 177 |
else: |
b/utils/proxy.py | ||
---|---|---|
5 | 5 |
from django.conf import settings |
6 | 6 |
import logging |
7 | 7 |
from django.core.cache import cache |
8 |
import os |
|
9 |
|
|
10 |
cwd = os.getcwd() |
|
11 |
|
|
12 |
|
|
13 |
LOG_FILENAME = os.path.join(cwd, 'log/celery_jobs.log') |
|
14 |
|
|
15 |
#FORMAT = '%(asctime)s %(levelname)s: %(message)s' |
|
16 |
#logging.basicConfig(format=FORMAT) |
|
17 |
formatter = logging.Formatter('%(asctime)s %(levelname)s: %(message)s') |
|
8 | 18 |
|
9 |
FORMAT = '%(asctime)s %(levelname)s: %(message)s' |
|
10 |
logging.basicConfig(format=FORMAT) |
|
11 | 19 |
logger = logging.getLogger(__name__) |
12 | 20 |
logger.setLevel(logging.DEBUG) |
21 |
handler = logging.FileHandler(LOG_FILENAME) |
|
22 |
handler.setFormatter(formatter) |
|
23 |
logger.addHandler(handler) |
|
13 | 24 |
|
14 | 25 |
class Retriever(object): |
15 | 26 |
def __init__(self, device=settings.NETCONF_DEVICE, username=settings.NETCONF_USER, password=settings.NETCONF_PASS, filter=settings.ROUTES_FILTER, route_name=None, xml=None): |
Also available in: Unified diff