github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/828/merge
q4speed 2018-01-02 16:50:57 +08:00
parent 54bcb33a0e 6d15f60c5c
commit bf34c2e320
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/tasks.py
View File

@ -19,7 +19,7 @@ FORKS = 10
TIMEOUT = 60 TIMEOUT = 60
logger = get_logger(__file__) logger = get_logger(__file__)
CACHE_MAX_TIME = 60*60*60 CACHE_MAX_TIME = 60*60*60
disk_pattern = re.compile(r'^hd|sd') disk_pattern = re.compile(r'^hd|sd|xvd')
@shared_task @shared_task

4
apps/common/utils.py
View File

@ -327,6 +327,10 @@ def capacity_convert(size, expect='auto', rate=1000):
if rate > std_size/rate_ > 1: if rate > std_size/rate_ > 1:
expect = unit expect = unit
break break
if expect not in rate_mapping:
expect = 'K'
expect_size = std_size / rate_mapping[expect] expect_size = std_size / rate_mapping[expect]
return expect_size, expect return expect_size, expect

2
config_example.py
View File

@ -119,5 +119,5 @@ class ProductionConfig(Config):
# Default using Config settings, you can write if/else for different env # Default using Config settings, you can write if/else for different env
config = Config() config = DevelopmentConfig()

2
requirements/mac_requirements.txt
View File

@ -1 +1 @@
openssl brew install libtiff libjpeg webp little-cms2 brew install libtiff libjpeg webp little-cms2 openssl