github/nohang
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix re

Browse Source
This commit is contained in:
Alexey Avramov 2018-12-11 20:49:10 +09:00
parent b3f944776f
commit 059cf2e5b7
1 changed files with 74 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
nohang
View File

@ -835,94 +835,91 @@ mlockall = conf_parse_bool('mlockall')
gui_low_memory_warnings = conf_parse_bool('gui_low_memory_warnings') gui_low_memory_warnings = conf_parse_bool('gui_low_memory_warnings')
gui_notifications = conf_parse_bool('gui_notifications') gui_notifications = conf_parse_bool('gui_notifications')
decrease_oom_score_adj = conf_parse_bool('decrease_oom_score_adj') decrease_oom_score_adj = conf_parse_bool('decrease_oom_score_adj')
execute_the_command = conf_parse_bool('execute_the_command')
regex_matching = conf_parse_bool('regex_matching') regex_matching = conf_parse_bool('regex_matching')
if regex_matching: if regex_matching:
from re import search from re import search
import sre_constants import sre_constants
execute_the_command = conf_parse_bool('execute_the_command') prefer_regex = conf_parse_string('prefer_regex')
if prefer_regex == '':
print('Invalid prefer_regex value, ' \
'regex pattern must not be empty')
exit()
# RE pattern validation
try:
search(prefer_regex, '')
except sre_constants.error:
print('Invalid prefer_regex value, ' \
'invalid RE pattern: {}'.format(prefer_regex))
exit()
prefer_regex = conf_parse_string('prefer_regex') avoid_regex = conf_parse_string('avoid_regex')
if prefer_regex == '': if avoid_regex == '':
print('Invalid prefer_regex value, ' \ print('Invalid avoid_regex value, ' \
'regex pattern must not be empty') 'regex pattern must not be empty')
exit() exit()
# RE pattern validation # RE pattern validation
try: try:
search(prefer_regex, '') search(avoid_regex, '')
except sre_constants.error: except sre_constants.error:
print('Invalid prefer_regex value, ' \ print('Invalid avoid_regex value, ' \
'invalid RE pattern: {}'.format(prefer_regex)) 'invalid RE pattern: {}'.format(avoid_regex))
exit() exit()
avoid_regex = conf_parse_string('avoid_regex') prefer_re_cmdline = conf_parse_string('prefer_re_cmdline')
if avoid_regex == '': if prefer_re_cmdline == '':
print('Invalid avoid_regex value, ' \ print('Invalid prefer_re_cmdline value, ' \
'regex pattern must not be empty') 'regex pattern must not be empty')
exit() exit()
# RE pattern validation # RE pattern validation
try: try:
search(avoid_regex, '') search(prefer_re_cmdline, '')
except sre_constants.error: except sre_constants.error:
print('Invalid avoid_regex value, ' \ print('Invalid prefer_re_cmdline value, ' \
'invalid RE pattern: {}'.format(avoid_regex)) 'invalid RE pattern: {}'.format(prefer_re_cmdline))
exit() exit()
prefer_re_cmdline = conf_parse_string('prefer_re_cmdline') avoid_re_cmdline = conf_parse_string('avoid_re_cmdline')
if prefer_re_cmdline == '': if avoid_re_cmdline == '':
print('Invalid prefer_re_cmdline value, ' \ print('Invalid avoid_re_cmdline value, ' \
'regex pattern must not be empty') 'regex pattern must not be empty')
exit() exit()
# RE pattern validation # RE pattern validation
try: try:
search(prefer_re_cmdline, '') search(avoid_re_cmdline, '')
except sre_constants.error: except sre_constants.error:
print('Invalid prefer_re_cmdline value, ' \ print('Invalid avoid_re_cmdline value, ' \
'invalid RE pattern: {}'.format(prefer_re_cmdline)) 'invalid RE pattern: {}'.format(avoid_re_cmdline))
exit() exit()
prefer_re_uid = conf_parse_string('prefer_re_uid')
if prefer_re_uid == '':
print('Invalid prefer_re_uid value, ' \
'regex pattern must not be empty')
exit()
# RE pattern validation
try:
search(prefer_re_uid, '')
except sre_constants.error:
print('Invalid prefer_re_uid value, ' \
'invalid RE pattern: {}'.format(prefer_re_uid))
exit()
avoid_re_cmdline = conf_parse_string('avoid_re_cmdline') avoid_re_uid = conf_parse_string('avoid_re_uid')
if avoid_re_cmdline == '': if avoid_re_uid == '':
print('Invalid avoid_re_cmdline value, ' \ print('Invalid avoid_re_uid value, ' \
'regex pattern must not be empty') 'regex pattern must not be empty')
exit() exit()
# RE pattern validation # RE pattern validation
try: try:
search(avoid_re_cmdline, '') search(avoid_re_uid, '')
except sre_constants.error: except sre_constants.error:
print('Invalid avoid_re_cmdline value, ' \ print('Invalid avoid_re_uid value, ' \
'invalid RE pattern: {}'.format(avoid_re_cmdline)) 'invalid RE pattern: {}'.format(avoid_re_uid))
exit() exit()
prefer_re_uid = conf_parse_string('prefer_re_uid')
if prefer_re_uid == '':
print('Invalid prefer_re_uid value, ' \
'regex pattern must not be empty')
exit()
# RE pattern validation
try:
search(prefer_re_uid, '')
except sre_constants.error:
print('Invalid prefer_re_uid value, ' \
'invalid RE pattern: {}'.format(prefer_re_uid))
exit()
avoid_re_uid = conf_parse_string('avoid_re_uid')
if avoid_re_uid == '':
print('Invalid avoid_re_uid value, ' \
'regex pattern must not be empty')
exit()
# RE pattern validation
try:
search(avoid_re_uid, '')
except sre_constants.error:
print('Invalid avoid_re_uid value, ' \
'invalid RE pattern: {}'.format(avoid_re_uid))
exit()
mem_min_sigterm_kb, mem_min_sigterm_mb, mem_min_sigterm_percent = calculate_percent( mem_min_sigterm_kb, mem_min_sigterm_mb, mem_min_sigterm_percent = calculate_percent(