Skip to content

Commit

Permalink
Fix service startup order
Browse files Browse the repository at this point in the history
Ensure configSemTK updates environment file before rest of SemTK
services start.

configSemTK.sh: Fix sed regular expression so trailing whitespace
doesn't prevent sed from replacing line anyway.

service.unit: Ensure rest of SemTK services start after configSemTK
has been run.

sparqlGraphIngestionService/src/main/resources/application.properties:
Remove trailing whitespace from ingestion.loadTrackAwsRegion line.
  • Loading branch information
tuxji committed Apr 11, 2022
1 parent 627d0c1 commit 48737d8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion configSemTK.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ source .env

# Create an environment file containing the environment variables used in services' application.properties
# This file is used at service startup (via service.unit)
cat ./*Service/BOOT-INF/classes/application.properties | grep "{" | sed -e 's/^.*{\(.*\)}$/\1=${\1}/' | sort | uniq | envsubst > environment
cat ./*Service/BOOT-INF/classes/application.properties | grep "{" | sed -e 's/^.*{\(.*\)}/\1=${\1}/' | sort | uniq | envsubst > environment

# Replace the js configuration files for the SemTK webapps
./configWebapps.sh "${WEBAPPS}"
2 changes: 1 addition & 1 deletion service.unit
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=${SERVICE}
After=fuseki.service virtuoso.service ontologyInfoService.service
After=configSemTK.service fuseki.service virtuoso.service ontologyInfoService.service

[Service]
User=${USER}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ ingestion.loggingPort=${LOGGING_SERVICE_PORT}
ingestion.loggingServiceLocation=${LOGGING_SERVICE_ENDPOINT}
ingestion.applicationLogName=${ingestionApplicationName}
ingestion.loadTrackFolder=${ingestionLoadTrackFolder}
ingestion.loadTrackAwsRegion=${ingestionLoadTrackAwsRegion}
ingestion.loadTrackAwsRegion=${ingestionLoadTrackAwsRegion}
ingestion.loadTrackS3Bucket=${ingestionLoadTrackS3Bucket}


ingestion.oinfo.protocol=${ONTOLOGYINFO_SERVICE_PROTOCOL}
ingestion.oinfo.server=${ONTOLOGYINFO_SERVICE_HOST}
ingestion.oinfo.port=${PORT_ONTOLOGYINFO_SERVICE}
Expand Down

0 comments on commit 48737d8

Please sign in to comment.