Fixes for prepocessing daemon

preprocessor/preprocessor/cli.py

@@ -6,6 +6,7 @@ import yaml
 import jsonschema
 
 from .preprocess import preprocess_file
+from .daemon import run_daemon
 
 
 def setup_logging(debug=False):
@@ -44,8 +45,18 @@ def cli():
 
 
 @cli.command(help='Run the preprocess daemon, attaching to a Redis queue')
-def daemon(ctx):
-    click.echo(ctx['CONFIG'])
+@click.option('--config-file', type=click.File('r'))
+@click.option('--use-dir', type=str) # TODO: check dir
+@click.option('--validate/--no-validate', default=False)
+@click.option('--host', type=str)
+@click.option('--port', type=int)
+@click.option('--listen-queue', type=str)
+@click.option('--write-queue', type=str)
+def daemon(config_file=None, use_dir=None, validate=False, host=None, port=None, listen_queue=None, write_queue=None):
+    config = yaml.load(config_file)
+    if validate:
+        validate_config(config)
+    run_daemon(config, host, port, listen_queue, write_queue)
 
 
 @cli.command(help='Run a single, one-off preprocessing')

preprocessor/preprocessor/preprocess.py

@@ -246,7 +246,9 @@ def preprocess_file(config: dict, file_path: os.PathLike, use_dir: os.PathLike=N
             % (upload_timer.elapsed)
         )
 
-    logger.info(
-        'Finished preprocessing of %s after %f seconds.'
-        % (file_path, preprocess_timer.elapsed)
-    )
+        logger.info(
+            'Finished preprocessing of %s after %f seconds.'
+            % (file_path, preprocess_timer.elapsed)
+        )
+
+        return upload_filenames