diff --git a/conf/requirements.pip b/conf/requirements.pip index fc8f15ea6ee25def0dc0a246c79a347907ad6210..bac2a760ba329ca7fd649220d55e071230c92697 100644 --- a/conf/requirements.pip +++ b/conf/requirements.pip @@ -27,7 +27,7 @@ requests==2.23.0 rrdtool==0.1.15 pyyaml==5.3.1 pydgets==0.9 -pyzenkit==0.59 +pyzenkit==0.61 pynspect==0.17 ipranges==0.1.10 typedcols==0.1.13 diff --git a/lib/mentat/__init__.py b/lib/mentat/__init__.py index bcc8f978baf26ee53059fe123a01ad8f53ea00bc..ac8b741ef79f641e354fbc64c5cd4aa1e4a9c978 100644 --- a/lib/mentat/__init__.py +++ b/lib/mentat/__init__.py @@ -20,4 +20,4 @@ open-source project. __author__ = "Jan Mach <jan.mach@cesnet.cz>" __credits__ = "Pavel Kácha <pavel.kacha@cesnet.cz>, Andrea Kropáčová <andrea.kropacova@cesnet.cz>" -__version__ = "2.8.112" +__version__ = "2.8.113" diff --git a/lib/mentat/system.py b/lib/mentat/system.py index 90e2ae79cdaeb60241f90135017b3cbd438915e1..cf54768e876e10b95be60b8d2c50d5b930167fa5 100644 --- a/lib/mentat/system.py +++ b/lib/mentat/system.py @@ -85,13 +85,13 @@ OVERALL_STATUS_MESSAGES = { REGEXP_MENTAT_PS = re.compile(r'\s*(\d+)\s+([^\s]+)\s+([^\s]*(?:python(?:\d+(?:\.\d+)?)?))\s+[^\s]+(mentat-[^\s]+)(?:\s+(.*))?') """Regular expression for selecting Mentat related processes.""" -REGEXP_MENTAT_PIDF = re.compile(r'(.+?)(?:\.(\d+))?\.pid$') +REGEXP_MENTAT_PIDF = re.compile(r'(.+?)(?:\.([0-9a-fA-F]+))?\.pid$') """Regular expression for selecting Mentat related PID files.""" REGEXP_MENTAT_CRONF = re.compile(r'(.+)\.cron$') """Regular expression for selecting Mentat related log files.""" REGEXP_MENTAT_LOGF = re.compile(r'(.+)\.log$') """Regular expression for selecting Mentat related log files.""" -REGEXP_MENTAT_RLOGF = re.compile(r'(.+)(?:\.(\d+))?\.runlog$') +REGEXP_MENTAT_RLOGF = re.compile(r'(.+)(?:\.([0-9a-fA-F]+))?\.runlog$') """Regular expression for selecting Mentat related runlog files.""" REGEXP_MENTAT_CACHEF = re.compile(r'(.+)\.json$') """Regular expression for selecting Mentat related cache files.""" diff --git a/vagrantenv/provisioning/p02_mentat.sh b/vagrantenv/provisioning/p02_mentat.sh index 9406af9d5057cf7b07ebdf640295f126eca717ae..1fa0eb5715b03ee16e04451eae9bea55a881ce33 100644 --- a/vagrantenv/provisioning/p02_mentat.sh +++ b/vagrantenv/provisioning/p02_mentat.sh @@ -73,6 +73,7 @@ ensure_link /vagrant/conf /etc/mentat print_subtitle 'Preparing Python virtual environment' /etc/mentat/scripts/init-venv.sh source ${MENTAT_VENV}/bin/activate +chown -R vagrant:vagrant /var/mentat/venv print_subtitle 'Preparing application runtime environment' /etc/mentat/scripts/init-runenv.sh