Skip to content

Commit c982bd4

Browse files
committed
See CHANGELOG for v2.0.2
1 parent 170a3c7 commit c982bd4

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

CHANGELOG

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
v2.0.1 20221206 JP
1+
v2.0.2 20221206 JP
2+
- Improve logging
3+
4+
v2.0.1 20221205 JP
25
- Fix new service bug that prevented links and hosts from being added
36
- Set btn-access-auth border-radius
47
- Include information/help glyphicon in header linking to application information in the operations portal

Operations_ServiceIndex_Django/services/signals.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#from django.db import models
22
#import time
3-
import logging
43
from django.contrib.auth.models import User
54
from django.dispatch import receiver, Signal
65
from allauth.account.signals import user_logged_in
@@ -9,6 +8,9 @@
98
from allauth.socialaccount.providers.oauth2.client import OAuth2Error
109
from allauth.socialaccount.signals import pre_social_login
1110

11+
import logging
12+
logger = logging.getLogger(__name__)
13+
1214
@receiver(user_logged_in)
1315
def set_username(request, user, **kwargs):
1416
try:
@@ -23,6 +25,9 @@ def set_username(request, user, **kwargs):
2325

2426
user.username = username
2527
user.save()
28+
msg = '{} logged in as {}'.format(subject, request.user.username)
29+
logger.info(msg)
30+
2631

2732
@receiver(pre_social_login)
2833
def connect_existing_user(request, sociallogin, **kwargs):
@@ -33,11 +38,14 @@ def connect_existing_user(request, sociallogin, **kwargs):
3338
email = sociallogin.email_addresses[0]
3439
except:
3540
raise OAuth2Error('ACCESS CI Identity required email is missing')
36-
41+
3742
try: # username is unique
3843
existing_user = User.objects.get(email=email)
3944
except: # Let socialaccount handle creation
4045
return
4146

4247
sociallogin.connect(request, existing_user)
4348
setup_user_email(request, existing_user, [])
49+
msg = 'login as email {} connected to {}'.format(email, existing_user.username)
50+
logger.info(msg)
51+

Operations_ServiceIndex_Django/services/views.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ def export(request):
329329
t = get_template('services/export.txt')
330330
context = {'services':services}
331331
response.write(t.render(context, request))
332+
msg = '{} exported data'.format(request.user.username)
333+
logger.info(msg)
332334
return response
333335

334336
else:
@@ -705,10 +707,10 @@ def add_event(request):
705707
e = form.save() # creates Event
706708
# make status entries for each host
707709
for h in Host.objects.filter(service__deprecated=False):
708-
hes = HostEventStatus(event=e,host=h,
709-
status=HostEventStatus.UNCHECKED)
710+
hes = HostEventStatus(event=e, host=h, status=HostEventStatus.UNCHECKED)
710711
hes.save()
711-
712+
msg = '{} reported new event: {}'.format(request.user.username, e.name)
713+
logger.info(msg)
712714
return redirect(reverse('services:events'))
713715
else:
714716
form = AddEventForm()
@@ -757,6 +759,8 @@ def update_event(request, hes_id):
757759
log.save()
758760
hes.status = form.cleaned_data['status']
759761
hes.save()
762+
msg = '{} logged event for \'{}\' host'.format(request.user.username, hes.host.hostname)
763+
logger.info(msg)
760764
return redirect(reverse('services:event', args=[hes.event.id]))
761765
else:
762766
#form = UpdateEventForm(instance=hes)

0 commit comments

Comments
 (0)