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

fix: ORS_CONFIG_LOCATION not logging with wrong paths #1960

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Conversation

merydian
Copy link

Pull Request Checklist

  • 1. I have rebased the latest version of the main branch into my feature branch and all conflicts
    have been resolved.
  • 2. I have added information about the change/addition to functionality to the CHANGELOG.md file under the
    [Unreleased] heading.
  • 3. I have documented my code using JDocs tags.
  • 4. I have removed unnecessary commented out code, imports and System.out.println statements.
  • 5. I have written JUnit tests for any new methods/classes and ensured that they pass.
  • 6. I have created API tests for any new functionality exposed to the API.
  • 7. If changes/additions are made to the ors-config.json file, I have added these to the ors config documentation
    along with a short description of what it is for, and documented this in the Pull Request (below).
  • 8. I have built graphs with my code of the Heidelberg.osm.gz file and run the api-tests with all test passing
  • 9. I have referenced the Issue Number in the Pull Request (if the changes were from an issue).
  • 10. For new features or changes involving building of graphs, I have tested on a larger dataset
    (at least Germany), and the graphs build without problems (i.e. no out-of-memory errors).
  • 11. For new features or changes involving the graphbuilding process (i.e. changing encoders, updating the
    importer etc.), I have generated longer distance routes for the affected profiles with different options
    (avoid features, max weight etc.) and compared these with the routes of the same parameters and start/end
    points generated from the current live ORS.
    If there are differences then the reasoning for these MUST be documented in the pull request.
  • 12. I have written in the Pull Request information about the changes made including their intended usage
    and why the change was needed.
  • 13. For changes touching the API documentation, I have tested that the API playground renders correctly.

Closes #1816 .

Information about the changes

  • Key functionality added: When a wrong path is set as ORS_CONFIG_LOCATION, this is now no longer silently ignored, but logged.
  • Reason for change: Better logging.

The WAR_CONTAINER test is still failing because ors.config.location is set in the war.Dockerfile:

echo 'export JAVA_OPTS="$JAVA_OPTS -Dors.config.location=/home/ors/openrouteservice/ors-config.yml"' >> /usr/local/tomcat/bin/setenv.sh

I am yet to figure out how to fix this.

Examples and reasons for differences between live ORS routes, and those generated from this pull request

  • None

Required changes to ors config (if applicable)

  • None

@merydian merydian changed the title Fix ORS_CONFIG_LOCATION not logging with wrong paths fix: ORS_CONFIG_LOCATION not logging with wrong paths Jan 27, 2025
@github-actions github-actions bot added the fix label Jan 27, 2025
@koebi koebi requested a review from sfendrich January 27, 2025 12:56
@github-actions github-actions bot added fix and removed fix labels Jan 27, 2025
Copy link
Contributor

@sfendrich sfendrich left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution!

Please make this branch up-to date with main and address the comment below.

Copy link
Contributor

@sfendrich sfendrich left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ORS_CONFIG_LOCATION doesn't work with *.yaml files
2 participants