ionelmc / django-redisboard / 88

pending completion

Build # 88

Build Type

Pull #37

travis-ci

Committed by

web-flow

Commit Message

solve issue #35 and #36

mark_safe some server column html
convert str key request parameter in bytes

Pull Request Pull Request #37: solve issue #35 and #36

Run Details

80 of 126 branches covered (63.49%)

7 of 7 new or added lines in 2 files covered. (100.0%)

380 of 457 relevant lines covered (83.15%)

7.33 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

92.22

/src/redisboard/admin.py

# vim: set fileencoding=utf-8 :
from functools import update_wrapper

from django.contrib import admin

try:
    from django.urls import reverse
except:
    from django.core.urlresolvers import reverse

from django.http import HttpResponseForbidden
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext_lazy as _
from django.utils.safestring import mark_safe

from .models import RedisServer
from .utils import PY3
from .views import inspect

if PY3:
    unicode = str


class RedisServerAdmin(admin.ModelAdmin):
    class Media:
        css = {
            'all': ('redisboard/admin.css',)
        }

    list_display = (
        '__unicode__',
        'status',
        'memory',
        'clients',
        'details',
        'cpu_utilization',
        'slowlog',
        'tools',
    )

    list_filter = 'label', 'hostname'
    ordering = ('hostname', 'port')

    def slowlog(self, obj):
        output = [(float('inf'), 'Total: %d items' % obj.stats['slowlog_len'])]
        for log in obj.stats['slowlog']:
            command = log['command']

            if len(command) > 255:
                command = str(command[:252]) + '...'

            output.append((
                log['duration'],
                u'%.1fms: %r' % (log['duration'] / 1000., command),
            ))
        if output:
            return mark_safe('<br><br>'.join(l for _, l in sorted(output, reverse=True)))
        else:
            return 'n/a'
    slowlog.allow_tags = True
    slowlog.long_description = _('Slowlog')

    def status(self, obj):
        return obj.stats['status']
    status.long_description = _("Status")

    def memory(self, obj):
        return obj.stats['memory']
    memory.long_description = _("Memory")

    def clients(self, obj):
        return obj.stats['clients']
    clients.long_description = _("Clients")

    def tools(self, obj):
        return mark_safe('<a href="%s">%s</a>' % (
            reverse("admin:redisboard_redisserver_inspect", args=(obj.id,)),
            unicode(_("Inspect")))
        )
    tools.allow_tags = True
    tools.long_description = _("Tools")

    def details(self, obj):
        output = []
        brief_details = obj.stats['brief_details']
        for k, v in (brief_details.items() if PY3 else brief_details.iteritems()):
            output.append('<dt>%s</dt><dd>%s</dd>' % (k, v))
        if output:
            return mark_safe('<dl class="details">%s</dl>' % ''.join(output))
        return 'n/a'
    details.allow_tags = True
    details.long_description = _("Details")

    def cpu_utilization(self, obj):
        stats = obj.stats
        if stats['status'] != 'UP':
            return 'n/a'

        data = (
            'used_cpu_sys',
            'used_cpu_sys_children',
            'used_cpu_user',
            'used_cpu_user_children',
        )
        data = dict((k, stats['details'][k]) for k in data)
        total_cpu = sum(data.values() if PY3 else data.itervalues())
        uptime = stats['details']['uptime_in_seconds']
        data['cpu_utilization'] = '%.3f%%' % (total_cpu / uptime if uptime else 0)

        data = sorted(data.items())

        output = []
        for k, v in data:
            k = k.replace('_', ' ')
            output.append('<dt>%s</dt><dd>%s</dd>' % (k, v))

        return mark_safe('<dl class="details">%s</dl>' % ''.join(output))
    cpu_utilization.allow_tags = True
    cpu_utilization.long_description = _('CPU Utilization')

    def get_urls(self):
        urlpatterns = super(RedisServerAdmin, self).get_urls()
        try:
            from django.conf.urls import url
        except ImportError:
            from django.conf.urls.defaults import url

        def wrap(view):
            def wrapper(*args, **kwargs):
                return self.admin_site.admin_view(view)(*args, **kwargs)

            return update_wrapper(wrapper, view)

        return [url(r'^(\d+)/inspect/$',
                    wrap(self.inspect_view),
                    name='redisboard_redisserver_inspect')
                ] + urlpatterns

    def inspect_view(self, request, server_id):
        server = get_object_or_404(RedisServer, id=server_id)
        if (
            self.has_change_permission(request, server) and
            request.user.has_perm('redisboard.can_inspect')
        ):
            return inspect(request, server)
        else:
            return HttpResponseForbidden("You can't inspect this server.")


admin.site.register(RedisServer, RedisServerAdmin)

1	# vim: set fileencoding=utf-8 :
2	from functools import update_wrapper	9✔
3
4	from django.contrib import admin	9✔
5
6	try:	9✔
7	from django.urls import reverse	9✔
8	except:	6 only TOXENV=2.7-1.9-cover,report,coveralls,codecov, TOXENV=2.7-1.8-cover,report,coveralls,codecov, TOXENV=3.4-1.8-cover,report,coveralls,codecov, TOXENV=3.4-1.9-cover,report,coveralls,codecov, TOXENV=3.5-1.8-cover,report,coveralls,codecov, and TOXENV=3.5-1.9-cover,report,coveralls,codecov ✔
9	from django.core.urlresolvers import reverse	6 only TOXENV=2.7-1.9-cover,report,coveralls,codecov, TOXENV=2.7-1.8-cover,report,coveralls,codecov, TOXENV=3.4-1.8-cover,report,coveralls,codecov, TOXENV=3.4-1.9-cover,report,coveralls,codecov, TOXENV=3.5-1.8-cover,report,coveralls,codecov, and TOXENV=3.5-1.9-cover,report,coveralls,codecov ✔
10
11	from django.http import HttpResponseForbidden	9✔
12	from django.shortcuts import get_object_or_404	9✔
13	from django.utils.translation import ugettext_lazy as _	9✔
14	from django.utils.safestring import mark_safe	9✔
15
16	from .models import RedisServer	9✔
17	from .utils import PY3	9✔
18	from .views import inspect	9✔
19
20	if PY3:	9✔
21	unicode = str	6 only TOXENV=3.4-1.10-cover,report,coveralls,codecov, TOXENV=3.5-1.10-cover,report,coveralls,codecov, TOXENV=3.4-1.8-cover,report,coveralls,codecov, TOXENV=3.4-1.9-cover,report,coveralls,codecov, TOXENV=3.5-1.8-cover,report,coveralls,codecov, and TOXENV=3.5-1.9-cover,report,coveralls,codecov ✔
22
23
24	class RedisServerAdmin(admin.ModelAdmin):	9✔
25	class Media:	9✔
26	css = {	9✔
27	'all': ('redisboard/admin.css',)
28	}
29
30	list_display = (	9✔
31	'__unicode__',
32	'status',
33	'memory',
34	'clients',
35	'details',
36	'cpu_utilization',
37	'slowlog',
38	'tools',
39	)
40
41	list_filter = 'label', 'hostname'	9✔
42	ordering = ('hostname', 'port')	9✔
43
44	def slowlog(self, obj):	9✔
45	output = [(float('inf'), 'Total: %d items' % obj.stats['slowlog_len'])]	9✔
46	for log in obj.stats['slowlog']:	9✔
47	command = log['command']	9✔
48
49	if len(command) > 255:	9!
50	command = str(command[:252]) + '...'	×
51
52	output.append((	9✔
53	log['duration'],
54	u'%.1fms: %r' % (log['duration'] / 1000., command),
55	))
56	if output:	9!
57	return mark_safe('<br><br>'.join(l for _, l in sorted(output, reverse=True)))	9✔
58	else:
59	return 'n/a'	×
60	slowlog.allow_tags = True	9✔
61	slowlog.long_description = _('Slowlog')	9✔
62
63	def status(self, obj):	9✔
64	return obj.stats['status']	9✔
65	status.long_description = _("Status")	9✔
66
67	def memory(self, obj):	9✔
68	return obj.stats['memory']	9✔
69	memory.long_description = _("Memory")	9✔
70
71	def clients(self, obj):	9✔
72	return obj.stats['clients']	9✔
73	clients.long_description = _("Clients")	9✔
74
75	def tools(self, obj):	9✔
76	return mark_safe('<a href="%s">%s</a>' % (	9✔
77	reverse("admin:redisboard_redisserver_inspect", args=(obj.id,)),
78	unicode(_("Inspect")))
79	)
80	tools.allow_tags = True	9✔
81	tools.long_description = _("Tools")	9✔
82
83	def details(self, obj):	9✔
84	output = []	9✔
85	brief_details = obj.stats['brief_details']	9✔
86	for k, v in (brief_details.items() if PY3 else brief_details.iteritems()):	9✔
87	output.append('<dt>%s</dt><dd>%s</dd>' % (k, v))	9✔
88	if output:	9!
89	return mark_safe('<dl class="details">%s</dl>' % ''.join(output))	9✔
90	return 'n/a'	×
91	details.allow_tags = True	9✔
92	details.long_description = _("Details")	9✔
93
94	def cpu_utilization(self, obj):	9✔
95	stats = obj.stats	9✔
96	if stats['status'] != 'UP':	9!
97	return 'n/a'	×
98
99	data = (	9✔
100	'used_cpu_sys',
101	'used_cpu_sys_children',
102	'used_cpu_user',
103	'used_cpu_user_children',
104	)
105	data = dict((k, stats['details'][k]) for k in data)	9✔
106	total_cpu = sum(data.values() if PY3 else data.itervalues())	9✔
107	uptime = stats['details']['uptime_in_seconds']	9✔
108	data['cpu_utilization'] = '%.3f%%' % (total_cpu / uptime if uptime else 0)	9✔
109
110	data = sorted(data.items())	9✔
111
112	output = []	9✔
113	for k, v in data:	9✔
114	k = k.replace('_', ' ')	9✔
115	output.append('<dt>%s</dt><dd>%s</dd>' % (k, v))	9✔
116
117	return mark_safe('<dl class="details">%s</dl>' % ''.join(output))	9✔
118	cpu_utilization.allow_tags = True	9✔
119	cpu_utilization.long_description = _('CPU Utilization')	9✔
120
121	def get_urls(self):	9✔
122	urlpatterns = super(RedisServerAdmin, self).get_urls()	9✔
123	try:	9✔
124	from django.conf.urls import url	9✔
125	except ImportError:	×
126	from django.conf.urls.defaults import url	×
127
128	def wrap(view):	9✔
129	def wrapper(args, *kwargs):	9✔
130	return self.admin_site.admin_view(view)(args, *kwargs)	9✔
131
132	return update_wrapper(wrapper, view)	9✔
133
134	return [url(r'^(\d+)/inspect/$',	9✔
135	wrap(self.inspect_view),
136	name='redisboard_redisserver_inspect')
137	] + urlpatterns
138
139	def inspect_view(self, request, server_id):	9✔
140	server = get_object_or_404(RedisServer, id=server_id)	9✔
141	if (	9!
142	self.has_change_permission(request, server) and
143	request.user.has_perm('redisboard.can_inspect')
144	):
145	return inspect(request, server)	9✔
146	else:
147	return HttpResponseForbidden("You can't inspect this server.")	×
148
149
150	admin.site.register(RedisServer, RedisServerAdmin)	9✔

ionelmc / django-redisboard / 88

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous