module: file_manager
Allow default metadata parser timeout to be configurable Signed-off-by: Paul Morgan moggieuk@hotmail.com
This commit is contained in:
parent
346a3d7c9d
commit
4d6037c3d3
|
@ -2280,6 +2280,8 @@ class MetadataStorage:
|
||||||
self.server = config.get_server()
|
self.server = config.get_server()
|
||||||
self.enable_object_proc = config.getboolean(
|
self.enable_object_proc = config.getboolean(
|
||||||
'enable_object_processing', False)
|
'enable_object_processing', False)
|
||||||
|
self.default_metadata_parser_timeout = config.getfloat(
|
||||||
|
'default_metadata_parser_timeout', 20.)
|
||||||
self.gc_path = ""
|
self.gc_path = ""
|
||||||
db.register_local_namespace(METADATA_NAMESPACE)
|
db.register_local_namespace(METADATA_NAMESPACE)
|
||||||
self.mddb = db.wrap_namespace(
|
self.mddb = db.wrap_namespace(
|
||||||
|
@ -2545,13 +2547,13 @@ class MetadataStorage:
|
||||||
filename = filename.replace("\"", "\\\"")
|
filename = filename.replace("\"", "\\\"")
|
||||||
cmd = " ".join([sys.executable, METADATA_SCRIPT, "-p",
|
cmd = " ".join([sys.executable, METADATA_SCRIPT, "-p",
|
||||||
self.gc_path, "-f", f"\"{filename}\""])
|
self.gc_path, "-f", f"\"{filename}\""])
|
||||||
timeout = 10.
|
timeout = self.default_metadata_parser_timeout
|
||||||
if ufp_path is not None and os.path.isfile(ufp_path):
|
if ufp_path is not None and os.path.isfile(ufp_path):
|
||||||
timeout = 300.
|
timeout = max(timeout, 300.)
|
||||||
ufp_path.replace("\"", "\\\"")
|
ufp_path.replace("\"", "\\\"")
|
||||||
cmd += f" -u \"{ufp_path}\""
|
cmd += f" -u \"{ufp_path}\""
|
||||||
if self.enable_object_proc:
|
if self.enable_object_proc:
|
||||||
timeout = 300.
|
timeout = max(timeout, 300.)
|
||||||
cmd += " --check-objects"
|
cmd += " --check-objects"
|
||||||
result = bytearray()
|
result = bytearray()
|
||||||
sc: SCMDComp = self.server.lookup_component('shell_command')
|
sc: SCMDComp = self.server.lookup_component('shell_command')
|
||||||
|
|
Loading…
Reference in New Issue