dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1495 from niphlod/fix/appadmin_ccache

Browse Source 
fix ccache page in appadmin, thanks MDSIII
This commit is contained in:
mdipierro
2016-10-14 10:08:41 -05:00
committed by GitHub
parent df3524878d 39e8cfb11a
commit 8c252e99cb
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/admin/controllers/appadmin.py
+4 -5
View File
@@ -213,7 +213,7 @@ def select():
if is_imap: if is_imap:
step = 3 step = 3
stop = start + step stop = start + step
table = None table = None
@@ -409,7 +409,7 @@ def ccache():
import copy import copy
import time import time
import math import math
from gluon import portalocker from pydal.contrib import portalocker
ram = { ram = {
'entries': 0, 'entries': 0,
@@ -421,7 +421,7 @@ def ccache():
'oldest': time.time(), 'oldest': time.time(),
'keys': [] 'keys': []
} }
disk = copy.copy(ram) disk = copy.copy(ram)
total = copy.copy(ram) total = copy.copy(ram)
disk['keys'] = [] disk['keys'] = []
@@ -465,8 +465,7 @@ def ccache():
ram['keys'].append((key, GetInHMS(time.time() - value[0]))) ram['keys'].append((key, GetInHMS(time.time() - value[0])))
for key in cache.disk.storage: for key in cache.disk.storage:
value = cache.disk.storage[key] if key == 'web2py_cache_statistics' and isinstance(value[1], dict):
if isinstance(value[1], dict):
disk['hits'] = value[1]['hit_total'] - value[1]['misses'] disk['hits'] = value[1]['hit_total'] - value[1]['misses']
disk['misses'] = value[1]['misses'] disk['misses'] = value[1]['misses']
try: try:
applications/examples/controllers/appadmin.py
+4 -5
View File
@@ -213,7 +213,7 @@ def select():
if is_imap: if is_imap:
step = 3 step = 3
stop = start + step stop = start + step
table = None table = None
@@ -409,7 +409,7 @@ def ccache():
import copy import copy
import time import time
import math import math
from gluon import portalocker from pydal.contrib import portalocker
ram = { ram = {
'entries': 0, 'entries': 0,
@@ -421,7 +421,7 @@ def ccache():
'oldest': time.time(), 'oldest': time.time(),
'keys': [] 'keys': []
} }
disk = copy.copy(ram) disk = copy.copy(ram)
total = copy.copy(ram) total = copy.copy(ram)
disk['keys'] = [] disk['keys'] = []
@@ -465,8 +465,7 @@ def ccache():
ram['keys'].append((key, GetInHMS(time.time() - value[0]))) ram['keys'].append((key, GetInHMS(time.time() - value[0])))
for key in cache.disk.storage: for key in cache.disk.storage:
value = cache.disk.storage[key] if key == 'web2py_cache_statistics' and isinstance(value[1], dict):
if isinstance(value[1], dict):
disk['hits'] = value[1]['hit_total'] - value[1]['misses'] disk['hits'] = value[1]['hit_total'] - value[1]['misses']
disk['misses'] = value[1]['misses'] disk['misses'] = value[1]['misses']
try: try:
applications/welcome/controllers/appadmin.py
+1 -2
View File
@@ -465,8 +465,7 @@ def ccache():
ram['keys'].append((key, GetInHMS(time.time() - value[0]))) ram['keys'].append((key, GetInHMS(time.time() - value[0])))
for key in cache.disk.storage: for key in cache.disk.storage:
value = cache.disk.storage[key] if key == 'web2py_cache_statistics' and isinstance(value[1], dict):
if isinstance(value[1], dict):
disk['hits'] = value[1]['hit_total'] - value[1]['misses'] disk['hits'] = value[1]['hit_total'] - value[1]['misses']
disk['misses'] = value[1]['misses'] disk['misses'] = value[1]['misses']
try: try: