Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GWDataFind Server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Code review analytics
Issue analytics
Insights
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
IGWN Computing and Software
GWDataFind
GWDataFind Server
Commits
cbae229d
Unverified
Commit
cbae229d
authored
2 years ago
by
Duncan Macleod
Browse files
Options
Downloads
Patches
Plain Diff
app: fix use of new configuration key
parent
784391fc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!53
Fix use of new configuration key
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gwdatafind_server/app.py
+4
-4
4 additions, 4 deletions
gwdatafind_server/app.py
tests/gwdatafind-server.ini
+1
-1
1 addition, 1 deletion
tests/gwdatafind-server.ini
with
5 additions
and
5 deletions
gwdatafind_server/app.py
+
4
−
4
View file @
cbae229d
...
...
@@ -32,10 +32,10 @@ class GWDataFindApp(Flask):
super
().
__init__
(
import_name
,
*
args
,
**
kwargs
)
config
=
ConfigObj
(
configpath
)
self
.
config
.
update
(
# use
new key
or old key
config
.
get
(
"
GWDataFindServer
"
,
config
[
"
LDRDataFindServer
"
]),
)
try
:
self
.
config
.
update
(
config
[
"
GWDataFindServer
"
])
#
new key
except
KeyError
:
self
.
config
.
update
(
config
[
"
LDRDataFindServer
"
])
# old key
# log to file
if
self
.
config
.
get
(
"
logfile
"
):
...
...
This diff is collapsed.
Click to expand it.
tests/gwdatafind-server.ini
+
1
−
1
View file @
cbae229d
[
LDR
DataFindServer]
[
GW
DataFindServer]
# frame cache file
framecachefile
=
tests/cache.dat
framecachetimeout
=
10
...
...
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