j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-04-05 21:15:25 +00:00
Code Issues Projects Releases Wiki Activity

logs i18n problems fixed

Browse source
This commit is contained in:
cserma 2023-04-27 16:06:19 +03:00
parent da9fbeaff4
commit b81b63a962
17 changed files with 8792 additions and 11604 deletions
Download patch file Download diff file Expand all files Collapse all files

25
nwfilters/views.py
View file

@ -3,7 +3,8 @@ from computes.models import Compute
from django.contrib import messages
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404, render
from django.utils.translation import gettext_lazy as _
# from django.utils.translation import gettext_lazy as _
from django.utils.translation import gettext_noop as _
from libvirt import libvirtError
from logs.views import addlogmsg
from vrtManager import util
@ -61,11 +62,11 @@ def nwfilters(request, compute_id):
"filter": name
}
conn.create_nwfilter(xml)
addlogmsg(request.user.username, compute.hostname, "", msg)
addlogmsg(request.user.username, compute.hostname, "", msg, ip=get_client_ip(request))
except libvirtError as lib_err:
messages.error(request, lib_err)
addlogmsg(
request.user.username, compute.hostname, "", lib_err
request.user.username, compute.hostname, "", lib_err, ip=get_client_ip(request)
)
if "del_nwfilter" in request.POST:
@ -98,7 +99,7 @@ def nwfilters(request, compute_id):
"NWFilter is in use by %(instance)s. Cannot be deleted."
) % {"instance": inst}
messages.error(request, msg)
addlogmsg(request.user.username, compute.hostname, "", msg)
addlogmsg(request.user.username, compute.hostname, "", msg, ip=get_client_ip(request))
i_conn.close()
break
@ -106,7 +107,7 @@ def nwfilters(request, compute_id):
if nwfilter and not in_use:
nwfilter.undefine()
nwfilters_all.remove(nwfilter_info)
addlogmsg(request.user.username, compute.hostname, "", msg)
addlogmsg(request.user.username, compute.hostname, "", msg, ip=get_client_ip(request))
if "cln_nwfilter" in request.POST:
name = request.POST.get("nwfiltername", "")
@ -119,15 +120,15 @@ def nwfilters(request, compute_id):
"name": name,
"clone": cln_name,
}
addlogmsg(request.user.username, compute.hostname, "", msg)
addlogmsg(request.user.username, compute.hostname, "", msg, ip=get_client_ip(request))
conn.close()
except libvirtError as lib_err:
messages.error(request, lib_err)
addlogmsg(request.user.username, compute.hostname, "", lib_err)
addlogmsg(request.user.username, compute.hostname, "", lib_err, ip=get_client_ip(request))
except Exception as err:
messages.error(request, err)
addlogmsg(request.user.username, compute.hostname, "", err)
addlogmsg(request.user.username, compute.hostname, "", err, ip=get_client_ip(request))
return render(
request,
@ -242,3 +243,11 @@ def nwfilter(request, compute_id, nwfltr):
messages.error(request, error_msg)
return render(request, "nwfilter.html", locals())
def get_client_ip(request):
x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
if x_forwarded_for:
ip = x_forwarded_for.split(',')[0]
else:
ip = request.META.get('REMOTE_ADDR')
return ip