Skip to content

Commit

Permalink
Merge pull request #849 from GIScience/fix#832-runfile
Browse files Browse the repository at this point in the history
fix runfile error handling
  • Loading branch information
takb authored Jan 25, 2021
2 parents 3e21c79 + ecc498b commit dbd2d50
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/project_automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@ jobs:
Handle_event:
runs-on: ubuntu-latest
steps:
- uses: takb/project-board@master
- name: run project board action
uses: takb/project-board@master
env:
PROJECT_AUTOMATION: ${{ secrets.PROJECT_AUTOMATION }}
if: env.PROJECT_AUTOMATION != null
with:
token: "${{ secrets.PROJECT_AUTOMATION }}"
owner: "GIScience"
repo: "openrouteservice"
project: "16"
columnbylabel: '{":bug: bug": "Priority"}'
ignorecolumnnames: "Priority,Assigned,In progress,Review,Awaiting release,Done"
ignorecolumnnames: "Priority,Assigned,In progress,Review,Awaiting release,Done"
3 changes: 2 additions & 1 deletion .github/workflows/run_maven_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ jobs:
with:
type: ${{ job.status }}
job_name: '*ORS CI Test*'
commit: true
# this does not work. https://github.com/GIScience/openrouteservice/runs/1648312213?check_suite_focus=true
# commit: false
token: ${{ secrets.PROJECT_AUTOMATION }}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ openrouteservice/src/main/resources/app.config*
docker/elevation_cache
docker/conf

# Ignore ors.run file
*ors.run

app.config.local
cgiar_provider/
graphs/
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ RELEASING:
-->

## [Unreleased]
### Added
- output run file to signal completion of graph building/loading at init time
### Fixed
- Define behavior for first container start with existing app.config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -625,12 +625,12 @@ public MatrixResult computeMatrix(MatrixRequest req) throws Exception {
}

public void createRunFile() {
File file=new File("ors.run");
File file = new File("ors.run");
try (FileWriter fw = new FileWriter(file)) {
fw.write("ORS init complete: "+ Instant.now().toString() + "\n");
fw.flush();
} catch(IOException ex) {
ex.printStackTrace();
} catch(Exception ex) {
LOGGER.warn("Failed to write ors.run file, this might cause problems with automated testing.");
}
}
}

0 comments on commit dbd2d50

Please sign in to comment.