Merge branch 'data_migrations' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into data_migrations

mamweb/settings_common.py

@@ -218,10 +218,14 @@ LOGGING = {
                 'handlers': ['console'],
                 'level': 'DEBUG',
                 },
-            'seminar.prihlaska':{
+            'seminar.prihlaska.form':{
 		'handlers': ['console','registration_logfile'],
 		'level': 'INFO'
 		},
+            'seminar.prihlaska.problem':{
+		'handlers': ['console','mail_registration','registration_error_log'],
+		'level': 'INFO'
+		},
 
             # Catch-all logger
             '': {
@@ -244,12 +248,24 @@ LOGGING = {
                 'class': 'django.utils.log.AdminEmailHandler',
                 'formatter': 'verbose', 
                 },
+            'mail_registraion': {
+                'level': 'WARN',
+                'class': 'django.utils.log.AdminEmailHandler',
+                'formatter': 'verbose', 
+                },
             'registration_logfile':{
                 'level': 'INFO',
 		'class': 'logging.FileHandler',
-		'filename': 'registration.log',
+		# filename declared in specific configuration files
                 'formatter': 'verbose', 
-		}
+		},
+	    'registration_error_log':{
+                'level': 'INFO',
+		'class': 'logging.FileHandler',
+		# filename declared in specific configuration files
+                'formatter': 'verbose', 
+		},
+		
             },
         }
 

mamweb/settings_prod.py

@@ -61,6 +61,8 @@ CSRF_COOKIE_SECURE = True
 
 LOGGING['loggers']['']['handlers'] = ['console', 'mail_admins']
 LOGGING['loggers']['django']['handlers'] = ['console', 'mail_admins']
+LOGGING['handlers']['registration_logfile']['filename'] = '/home/mam-web/logs/prod/registration.log'
+LOGGING['handlers']['registration_error_log']['filename'] = '/home/mam-web/logs/prod/registration_errors.log'
 
 
 # E-MAIL NOTIFICATIONS

mamweb/settings_test.py

@@ -65,3 +65,5 @@ CSRF_COOKIE_SECURE = True
 
 LOGGING['loggers']['']['handlers'] = ['console', 'mail_admins']
 LOGGING['loggers']['django']['handlers'] = ['console', 'mail_admins']
+LOGGING['handlers']['registration_logfile']['filename'] = '/home/mam-web/logs/test/registration.log'
+LOGGING['handlers']['registration_error_log']['filename'] = '/home/mam-web/logs/test/registration_errors.log'

seminar/forms.py

@@ -86,6 +86,7 @@ class PrihlaskaForm(forms.Form):
 
 		except ObjectDoesNotExist:
 			pass
+		return username
 
 	def clean_email(self):
 		err_logger = logging.getLogger('seminar.prihlaska.problem')
@@ -98,6 +99,7 @@ class PrihlaskaForm(forms.Form):
 
 		except ObjectDoesNotExist:
 			pass
+		return email
 
 
 	def clean(self):

seminar/views.py

@@ -1013,24 +1013,16 @@ def logoutView(request):
 	return render(request, 'seminar/login.html', {'form': form})
 
 
-def prihlaska_log_gdpr_safe(logger, gdpr_logger, msg, form_data):
-	msg = "{}, form_hash:{}".format(msg,hash(form_data))
-	logger.warn(msg)
-	gdpr_logger.warn(msg+", form:{}".format(form_data))		
-
-
 def prihlaskaView(request):
-	generic_logger = logging.getLogger('seminar.prihlaska')
 	err_logger = logging.getLogger('seminar.prihlaska.problem')
 	form_logger = logging.getLogger('seminar.prihlaska.form')
 	if request.method == 'POST':
 		form = PrihlaskaForm(request.POST)
-		# TODO vyresit, co se bude v jakych situacich zobrazovat
 		if form.is_valid():
-			generic_logger.info("Form valid")
 			fcd = form.cleaned_data
-			form_hash = hash(fcd)
-			form_logger.info(fcd,form_hash=form_hash)
+			form_hash = hash(frozenset(fcd.items()))
+			fcd["hash"] = form_hash
+			form_logger.info(fcd)
 			
 			with transaction.atomic():
 				u = User.objects.create_user(
@@ -1059,8 +1051,7 @@ def prihlaskaView(request):
 					o.stat = fcd['stat']
 				else:
 					# Unknown country - log it
-					msg = "Unknown country {}".format(fcd['stat_text'])
-					err_logger.warn(msg,form_hash=form_hash)
+					err_logger.warn("Unknown country {}. Form hash:{}".format(fcd['stat_text'],form_hash))
 
 				o.save()
 				o.user = u
@@ -1077,8 +1068,7 @@ def prihlaskaView(request):
 					r.skola = fcd['skola']
 				else:
 					# Unknown school - log it
-					msg = "Unknown school {}, {}".format(fcd['skola_nazev'],fcd['skola_adresa'])
-					err_logger.warn(msg,form_hash=form_hash)
+					err_logger.warn("Unknown school {}, {}. Form hash:{}".format(fcd['skola_nazev'],fcd['skola_adresa'],form_hash))
 				r.save()