Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-haz
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-haz
Commits
1f0ea187
Commit
1f0ea187
authored
3 years ago
by
Clayton, Brandon Scott
Browse files
Options
Downloads
Plain Diff
Merge branch 'log' into 'main'
Resolves - Micronaut Logging Closes
#483
See merge request
!565
parents
25a416df
688a7df5
No related branches found
No related tags found
2 merge requests
!577
Production Release | nshmp-haz
,
!565
Resolves - Micronaut Logging
Pipeline
#88058
passed
3 years ago
Stage: init
Stage: build
Stage: trigger
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/resources/application.yml
+6
-1
6 additions, 1 deletion
src/main/resources/application.yml
ws.Dockerfile
+1
-1
1 addition, 1 deletion
ws.Dockerfile
with
7 additions
and
2 deletions
src/main/resources/application.yml
+
6
−
1
View file @
1f0ea187
...
...
@@ -9,13 +9,18 @@ micronaut:
enabled
:
true
paths
:
classpath:swagger
mapping
:
/**
server
:
netty
:
access-logger
:
enabled
:
true
logger-name
:
http
nshmp-haz
:
##
# The basin service url
# To specify the url to use:
# java -jar build/libs/nshmp-haz.jar --basin-service-url=
basin-service-url
:
${basin-service-url:https://
staging-
earthquake.usgs.gov/nshmp/
ws/
data/basin}
basin-service-url
:
${basin-service-url:https://earthquake.usgs.gov/
ws/
nshmp/data/basin}
##
# The path to the models.
...
...
This diff is collapsed.
Click to expand it.
ws.Dockerfile
+
1
−
1
View file @
1f0ea187
...
...
@@ -42,7 +42,7 @@ FROM ${FROM_IMAGE}
LABEL
maintainer="Peter Powers <pmpowers@usgs.gov>, Brandon Clayton <bclayton@usgs.gov>"
ENV
CONTEXT_PATH="/"
ENV
BASIN_SERVICE_URL="https://earthquake.usgs.gov/nshmp/
ws/
data/basin"
ENV
BASIN_SERVICE_URL="https://earthquake.usgs.gov/
ws/
nshmp/data/basin"
ENV
JAVA_OPTS="-Xms2g -Xmx8g"
ENV
MODELS_DIRECTORY="/models"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment