Skip to content

Only open the mmap for reading if read_mode=True #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brian-brazil merged 3 commits into from
Sep 21, 2018
Merged

Only open the mmap for reading if read_mode=True #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4fb405
If only reading the mmap file, open in read-only mode.
coderanger Sep 21, 2018
067a600
Fix bug in WSGI app code.
coderanger Sep 21, 2018
474b9a1
Also set the mmap mode to match the read_mode flag.
coderanger Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions prometheus_client/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,11 +505,11 @@ class _MmapedDict(object):
Not thread safe.
"""
def __init__(self, filename, read_mode=False):
self._f = open(filename, 'a+b')
self._f = open(filename, 'rb' if read_mode else 'a+b')
if os.fstat(self._f.fileno()).st_size == 0:
self._f.truncate(_INITIAL_MMAP_SIZE)
self._capacity = os.fstat(self._f.fileno()).st_size
self._m = mmap.mmap(self._f.fileno(), self._capacity)
self._m = mmap.mmap(self._f.fileno(), self._capacity, access=mmap.ACCESS_READ if read_mode else mmap.ACCESS_WRITE)

self._positions = {}
self._used = _unpack_integer(self._m, 0)[0]
Expand Down
2 changes: 1 addition & 1 deletion prometheus_client/exposition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def make_wsgi_app(registry=core.REGISTRY):
def prometheus_app(environ, start_response):
params = parse_qs(environ.get('QUERY_STRING', ''))
r = registry
encoder, content_type = choose_encoder(environ.get['HTTP_ACCEPT'])
encoder, content_type = choose_encoder(environ.get('HTTP_ACCEPT'))
if 'name[]' in params:
r = r.restricted_registry(params['name[]'])
output = encoder(r)
Expand Down