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

fixed property name for getting rest modules db #453

Merged
merged 2 commits into from
Jun 22, 2015
Merged

fixed property name for getting rest modules db #453

merged 2 commits into from
Jun 22, 2015

Conversation

ryan321
Copy link

@ryan321 ryan321 commented Jun 1, 2015

Other places in the code the property name "ml.app-name-rest-modules' is used instead of ['ml.app-name']}-rest-modules. This isn't a problem if the properties resolve to the same value. But I have a situation where the rest-modules db is the same as the app modules db ( in build.properties I have: app-name-rest-modules=${app-name}-modules). So then an error is thrown on deployment that the rest db is not found because the assumption is that the rest db name will be {app-name}-rest-modules.

@@ -1534,7 +1534,7 @@ def deploy_rest
# Figure out where we need to deploy this stuff
rest_modules_db = ''
if @properties.has_key?('ml.rest-port') and @properties['ml.rest-port'] != ''
rest_modules_db = "#{@properties['ml.app-name']}-rest-modules"
rest_modules_db = "#{@properties['ml.app-name-rest-modules']}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can simplify this to:

rest_modules_db = @properties['ml.app-name-rest-modules']

@grtjn
Copy link
Contributor

grtjn commented Jun 4, 2015

Looks good, and nice find that rewriter for rest-port! I have just one minor comment. Can you append to the PR? Just commit to your dev branch and push to github, it will show up here automatically..

grtjn added a commit that referenced this pull request Jun 22, 2015
fixed property name for getting rest modules db
@grtjn grtjn merged commit 0d9e53e into marklogic-community:dev Jun 22, 2015
@grtjn
Copy link
Contributor

grtjn commented Jun 22, 2015

Hmm, on second thought, There is no such property ml.app-name-rest-modules. I think Ryan mistakenly took @ml.app-name-rest-modules as one property name, but it is actually really @{ml.app-name}-rest-modules..

I think we need to revert or fix this, and come up with a dedicated property for rest modules, maybe rest-modules-db..

grtjn added a commit to grtjn/roxy that referenced this pull request Jun 29, 2015
@grtjn grtjn modified the milestone: 1.7.3 Sep 17, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants