Skip to content

Conversation

@max-zilla
Copy link
Contributor

@max-zilla max-zilla commented Dec 16, 2022

Some additional cleanup as well:

  • API_HOST is now a config parameter instead of hardcoding
  • remove unused collections stubs
  • add UserLogin class so first/last name arent required for login
  • some heartbeat cleanup, remove default extractors exchange for job messages (doesn't work on fanout exchange)

removed collections, fixed exchange declaration, made host a config, a few other small things
@max-zilla max-zilla requested a review from tcnichol December 16, 2022 16:08
@max-zilla max-zilla requested review from ddey2 and lmarini December 16, 2022 16:43
Copy link
Contributor

@tcnichol tcnichol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested. Extractors register and the extractor info is now working properly.

I'll wait until this is merged in, then update the dockerize heartbeat pull request with these changes.

max-zilla and others added 4 commits December 16, 2022 11:03
is optional[dict] instead of list[dict]
…xtractor-register-fixes

# Conflicts:
#	backend/app/rabbitmq/heartbeat_listener_sync.py
is optional[dict] instead of list[dict]
connection = pika.BlockingConnection(parameters)
channel = connection.channel()
"""
channel.exchange_declare(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this block be deleted?

db = client["clowder2"]
existing_extractor = db["listeners"].find_one({"name": extractor_queue})
extractor_parameters = extractor_info["parameters"]["schema"]
extractor_info["parameters"] = extractor_parameters
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come we are reassigning parameters.schema to parameters in these two lines?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was a mistake. I took these lines out.

@tcnichol
Copy link
Contributor

Fixed how this one registers the extractor parameters. Parameters was a List[dict] changed it to be a dict.

@lmarini lmarini merged commit 21ddd58 into main Dec 21, 2022
@lmarini lmarini deleted the extractor-register-fixes branch December 21, 2022 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants