saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

file_recv_max_size config is specified in megabyte

Browse source
This commit is contained in:
Amir Pakdel 2013-12-09 10:50:52 -05:00
parent c934a9bd36
commit 49141cf042
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
conf/master
View file

@ -189,8 +189,9 @@
#file_recv: False
# Set a hard-limit on the size of the files that can be pushed to the master.
# Default: 100MB
#file_recv_max_size: 1024*1024*100
# It will be interpreted as megabytes.
# Default: 100
#file_recv_max_size: 100
##### Master Module Management #####
##########################################

2
salt/master.py
View file

@ -1154,7 +1154,7 @@ class AESFuncs(object):
return False
if not salt.utils.verify.valid_id(self.opts, load['id']):
return False
file_recv_max_size = self.opts.get('file_recv_max_size', 1024*1024*100)
file_recv_max_size = 1024*1024 * self.opts.get('file_recv_max_size', 100)
if len(load['data']) + load.get('loc', 0) > file_recv_max_size:
log.error(
'Exceeding file_recv_max_size limit: {0}'.format(