You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by ea...@apache.org on 2020/06/22 21:00:45 UTC
[incubator-sdap-ingester] branch bug_fixes updated: revert main
This is an automated email from the ASF dual-hosted git repository.
eamonford pushed a commit to branch bug_fixes
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-ingester.git
The following commit(s) were added to refs/heads/bug_fixes by this push:
new 579ea15 revert main
579ea15 is described below
commit 579ea157f6230412f683b977b746b2445f2780dc
Author: Eamon Ford <ea...@jpl.nasa.gov>
AuthorDate: Mon Jun 22 14:00:33 2020 -0700
revert main
---
collection_manager/collection_manager/main.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/collection_manager/collection_manager/main.py b/collection_manager/collection_manager/main.py
index 296cb12..a10446f 100644
--- a/collection_manager/collection_manager/main.py
+++ b/collection_manager/collection_manager/main.py
@@ -8,7 +8,7 @@ from collection_manager.services.history_manager import SolrIngestionHistoryBuil
logging.basicConfig(level=logging.INFO)
logging.getLogger("pika").setLevel(logging.WARNING)
-logger = logging.getLogger()
+logger = logging.getLogger("collection_manager")
def check_path(path) -> str:
@@ -19,23 +19,25 @@ def check_path(path) -> str:
def get_args() -> argparse.Namespace:
parser = argparse.ArgumentParser(description="Run ingestion for a list of collection ingestion streams")
- parser.add_argument("--collections-path",
+ parser.add_argument("--refresh",
+ help="refresh interval in seconds to check for new or updated granules",
+ default=300)
+ parser.add_argument("--collections",
help="Absolute path to collections configuration file",
- metavar="PATH",
required=True)
- parser.add_argument('--rabbitmq-host',
+ parser.add_argument('--rabbitmq_host',
default='localhost',
metavar='HOST',
help='RabbitMQ hostname to connect to. (Default: "localhost")')
- parser.add_argument('--rabbitmq-username',
+ parser.add_argument('--rabbitmq_username',
default='guest',
metavar='USERNAME',
help='RabbitMQ username. (Default: "guest")')
- parser.add_argument('--rabbitmq-password',
+ parser.add_argument('--rabbitmq_password',
default='guest',
metavar='PASSWORD',
help='RabbitMQ password. (Default: "guest")')
- parser.add_argument('--rabbitmq-queue',
+ parser.add_argument('--rabbitmq_queue',
default="nexus",
metavar="QUEUE",
help='Name of the RabbitMQ queue to consume from. (Default: "nexus")')
@@ -63,7 +65,7 @@ def main():
publisher.connect()
collection_processor = CollectionProcessor(message_publisher=publisher,
history_manager_builder=history_manager_builder)
- collection_watcher = CollectionWatcher(collections_path=options.collections_path,
+ collection_watcher = CollectionWatcher(collections_path=options.collections,
collection_updated_callback=collection_processor.process_collection,
granule_updated_callback=collection_processor.process_granule)