Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/correct rest api date fields #1187

Merged

Conversation

ericenns
Copy link
Member

@ericenns ericenns commented Feb 4, 2022

Description of changes

In 22.01 I incorrectly changed the response format of the REST API date fields to textual string instead of epoch ms. This reverts back to the old behavior and updates the UPGRADING.md to mention issues we faced when deploying 22.01.

Related issue

Link to the GitHub issue this pull request addresses using the #issuenum format. If it completes an issue, use Fixes #issuenum to automatically close the issue.

Checklist

Things for the developer to confirm they've done before the PR should be accepted:

  • CHANGELOG.md (and UPGRADING.md if necessary) updated with information for new change.
    * [ ] Tests added (or description of how to test) for any new features.
    * [ ] User documentation updated for UI or technical changes.

Copy link
Member

@apetkau apetkau left a comment

Choose a reason for hiding this comment

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

This looks awesome. Thanks so much for the fix.

I tested out launching a new instance of IRIDA and running pipelines/getting results using irida-staramr-results and irida-sistr-results. Both of these now work properly, so the API is returning the same values as before.

One other general comment I had is that I noticed when testing in my log files I am getting a lot of Hibernate SQL statements in the logs:

Hibernate: select analysissu0_.id as id2_6_, analysissu0_.analysis_description as analysis3_6_, analysissu0_.created_date as created_4_6_, analysissu0_.email_pipeline_result_completed as email_pi5_6_, analysissu0_.email_pipeline_result_error as email_pi6_6_, analysissu0_.modified_date as modified7_6_, analysissu0_.name as name8_6_, analysissu0_.named_parameters_id as named_p20_6_, analysissu0_.reference_file_id as referen21_6_, analysissu0_.submitter as submitt22_6_, analysissu0_.update_samples as update_s9_6_, analysissu0_.workflow_id as workflo10_6_, analysissu0_.analysis_id as analysi23_6_, analysissu0_.analysis_cleaned_state as analysi11_6_, analysissu0_.analysis_state as analysi12_6_, analysissu0_.automated as automat13_6_, analysissu0_.priority as priorit14_6_, analysissu0_.remote_analysis_id as remote_15_6_, analysissu0_.remote_input_data_id as remote_16_6_, analysissu0_.remote_workflow_id as remote_17_6_ from analysis_submission analysissu0_ where analysissu0_.DTYPE='AnalysisSubmission' and analysissu0_.analysis_state=?
...

Do you think I have something misconfigured here, or is the default settings for logging set to log SQL statements?

@apetkau apetkau self-requested a review February 4, 2022 16:17
Copy link
Member

@apetkau apetkau left a comment

Choose a reason for hiding this comment

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

This looks great.

For the printing of SQL statements in the logs, this was my mistake. I somehow had the following set in my /etc/irida/irida.conf:

hibernate.show_sql=true

Disabling that means no more SQL gets printed.

@apetkau apetkau merged commit ce12927 into phac-nml:master Feb 4, 2022
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.

2 participants