replace jquery file upload with filepond (idaholab#235, work in progr…

…ess)
mmguero-dev · Aug 9, 2023 · ceacedf · ceacedf
1 parent 6daa4c5
commit ceacedf
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/filebeat/scripts/filebeat-watch-zeeklogs-uploads-folder.py b/filebeat/scripts/filebeat-watch-zeeklogs-uploads-folder.py
@@ -104,6 +104,17 @@ def main():
         type=str,
         required=False,
     )
+    parser.add_argument(
+        '--recursive',
+        dest='recursiveAll',
+        help="Monitor all directories underneath --directory",
+        metavar='true|false',
+        type=str2bool,
+        nargs='?',
+        const=True,
+        default=False,
+        required=False,
+    )
     parser.add_argument(
         '-p',
         '--polling',
@@ -224,6 +235,7 @@ def main():
     watch_common.WatchAndProcessDirectory(
         watchDirs,
         args.polling,
+        args.recursiveAll,
         file_processor,
         {
             "logger": logging,

diff --git a/pcap-monitor/scripts/watch-pcap-uploads-folder.py b/pcap-monitor/scripts/watch-pcap-uploads-folder.py
@@ -115,6 +115,17 @@ def main():
         type=str,
         required=False,
     )
+    parser.add_argument(
+        '--recursive',
+        dest='recursiveAll',
+        help="Monitor all directories underneath --directory",
+        metavar='true|false',
+        type=str2bool,
+        nargs='?',
+        const=True,
+        default=False,
+        required=False,
+    )
     parser.add_argument(
         '-p',
         '--polling',
@@ -244,6 +255,7 @@ def main():
     watch_common.WatchAndProcessDirectory(
         watchDirs,
         args.polling,
+        args.recursiveAll,
         file_processor,
         {
             "logger": logging,

diff --git a/shared/bin/watch_common.py b/shared/bin/watch_common.py
@@ -287,6 +287,7 @@ def ProcessFileEventWorker(workerArgs):
 def WatchAndProcessDirectory(
     directories,
     polling,
+    recursive,
     fileProcessor,
     fileProcessorKwargs,
     assumeClosedSec,
@@ -301,7 +302,7 @@ def WatchAndProcessDirectory(
     )
     for directory in directories:
         loggerToUse.info(f"🗐\tScheduling {directory}")
-        observer.schedule(handler, directory, recursive=True)
+        observer.schedule(handler, directory, recursive=recursive)
 
     observer.start()
     try: