Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Commit f9c4a9e

Browse files
committed
Fixed #749: added app-modules-db prop for legacy with dep warning
1 parent 8b3ac5d commit f9c4a9e

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

deploy/default.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ app-role=${app-name}-role
108108
content-db=${app-name}-content
109109
modules-db=${app-name}-modules
110110

111+
# Note: purely for legacy support!
112+
app-modules-db=${modules-db}
113+
111114
#
112115
# Number of forests to create per host in the group for the content-db
113116
#

deploy/lib/server_config.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2870,6 +2870,15 @@ def build_config(config_files)
28702870
end
28712871

28722872
def replace_properties(contents, name)
2873+
# warn for deprecated properties
2874+
deprecated={
2875+
"app-modules-db" => "modules-db"
2876+
}
2877+
contents.scan(/(@ml.|[@$]\{)(app-modules-db)(\}?)/).each do |match|
2878+
key=match[1]
2879+
logger.warn("Deprecated property #{match.join} used in #{name}, please use ${#{deprecated[key]}} instead!")
2880+
end
2881+
28732882
# make sure to apply descending order to replace @ml.foo-bar before @ml.foo
28742883
@properties.sort {|x,y| y <=> x}.each do |k, v|
28752884
# new property syntax: @{app-name} or ${app-name}

0 commit comments

Comments
 (0)