Commit 7f9481bc authored by Manuela Kuhn's avatar Manuela Kuhn

Merge branch 'hotfix-3.1.2'

parents 1872a286 b5a69015
[bumpversion]
current_version = 3.1.1
current_version = 3.1.2
tag = False
commit = False
files = freeze_setup.py src/APIs/hidra/_version.py src/shared/_version.py
......
[bumpversion]
current_version = 3.1.1
current_version = 3.1.2
tag = False
commit = False
......
HiDRA develop
HiDRA 3.1.2
- Removed check for fix_subdirs in local_dir
HiDRA 3.1.1
- Disabled interactive shell in systemctl call (control server)
- Fixed missing files in spe
HiDRA 3.1.0
- Adjusted host names in mapping for control API
......
......@@ -125,7 +125,7 @@ executables = [
]
setup(name='HiDRA',
version='3.1.1',
version='3.1.2',
description='',
options={"build_exe": build_exe_options,
"bdist_msi": bdist_msi_options},
......
Name: hidra
Version: 3.1.1
Version: 3.1.2
Release: 1%{?dist}
Summary: High performance data multiplexing tool
......@@ -116,6 +116,8 @@ mkdir -p %{buildroot}/var/log/%{name}
/opt/%{name}/src/hidra_control/hidra_control_client.pyo
%changelog
* Fri May 12 2017 Manuela Kuhn <manuela.kuhn@desy.de> - 3.1.2-1
- Bump version
* Wed Apr 19 2017 Manuela Kuhn <manuela.kuhn@desy.de> - 3.1.1-1
- Bump version
* Wed Apr 19 2017 Manuela Kuhn <manuela.kuhn@desy.de> - 3.1.0-1
......
__version__ = b'3.1.1'
__version__ = b'3.1.2'
......@@ -277,15 +277,24 @@ def argument_parsing():
helpers.check_existance(params["log_path"])
if params["monitored_dir"]:
helpers.check_existance(params["monitored_dir"])
# the subdirs have to exist because handles can only be added to
# directories inside a directory in which a handle was already set,
# e.g. handlers set to current/raw, local:
# - all subdirs created are detected + handlers are set
# - new directory on the same as monitored dir
# (e.g. current/scratch_bl) cannot be detected
helpers.check_all_sub_dir_exist(params["monitored_dir"],
params["fix_subdirs"])
if params["store_data"]:
helpers.check_existance(params["local_target"])
# check if local_target contains fixed_subdirs
if not helpers.check_sub_dir_contained(params["local_target"],
params["fix_subdirs"]):
helpers.check_all_sub_dir_exist(params["local_target"],
params["fix_subdirs"])
# e.g. local_target = /beamline/p01/current/raw and
# fix_subdirs contain current/raw
# if not helpers.check_sub_dir_contained(params["local_target"],
# params["fix_subdirs"]):
# not in Eiger mode
# helpers.check_all_sub_dir_exist(params["local_target"],
# params["fix_subdirs"])
if params["use_data_stream"]:
helpers.check_ping(params["data_stream_targets"][0][0])
......
__version__ = '3.1.1'
__version__ = '3.1.2'
......@@ -240,6 +240,10 @@ def check_any_sub_dir_exists(dir_path, subdirs):
def check_sub_dir_contained(dir_path, subdirs):
""" Checks for dir_path contains one of the subdirs
e.g. dir_path=/gpfs, subdirs=[current/raw] -> False
dir_path=/beamline/p01/current/raw, subdirs=[current/raw] -> True
"""
subdir_contained = False
for subdir in subdirs:
if dir_path[-len(subdir):] == subdir:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment