diff options
| -rw-r--r-- | python/vyos/util.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py index 171ab397f..5a96013ea 100644 --- a/python/vyos/util.py +++ b/python/vyos/util.py @@ -504,7 +504,7 @@ def file_is_persistent(path): absolute = os.path.abspath(os.path.dirname(path)) return re.match(location,absolute) -def wait_for_inotify(file_path, event_type=None, timeout=None, sleep_interval=0.1): +def wait_for_inotify(file_path, pre_hook=None, event_type=None, timeout=None, sleep_interval=0.1): """ Waits for an inotify event to occur """ if not os.path.dirname(file_path): raise ValueError( @@ -521,8 +521,11 @@ def wait_for_inotify(file_path, event_type=None, timeout=None, sleep_interval=0. i = Inotify() i.add_watch(os.path.dirname(file_path)) + if pre_hook: + pre_hook() + for event in i.event_gen(yield_nones=True): - if (timeout is not None) and ((time.time() - time_start) > timeout): + if (timeout is not None) and ((time() - time_start) > timeout): # If the function didn't return until this point, # the file failed to have been written to and closed within the timeout raise OSError("Waiting for file {} to be written has failed".format(file_path)) @@ -533,10 +536,10 @@ def wait_for_inotify(file_path, event_type=None, timeout=None, sleep_interval=0. if event_type in type_names: return -def wait_for_file_write_complete(file_path, timeout=None, sleep_interval=0.1): +def wait_for_file_write_complete(file_path, pre_hook=None, timeout=None, sleep_interval=0.1): """ Waits for a process to close a file after opening it in write mode. """ wait_for_inotify(file_path, - event_type='IN_CLOSE_WRITE', timeout=timeout, sleep_interval=sleep_interval) + event_type='IN_CLOSE_WRITE', pre_hook=pre_hook, timeout=timeout, sleep_interval=sleep_interval) def commit_in_progress(): """ Not to be used in normal op mode scripts! """ |