You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by GitBox <gi...@apache.org> on 2020/01/04 13:04:58 UTC
[GitHub] [couchdb] janl opened a new pull request #2393: fix(#2143): allow
env var overrides for js query server config
janl opened a new pull request #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393
Closes #2143
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] janl commented on issue #2393: fix(#2143): allow env var
overrides for js query server config
Posted by GitBox <gi...@apache.org>.
janl commented on issue #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#issuecomment-572473264
nice
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] wohali commented on issue #2393: fix(#2143): allow env
var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
wohali commented on issue #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#issuecomment-571905571
Will test this tomorrow when i'm back near Windows.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] wohali commented on issue #2393: fix(#2143): allow env
var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
wohali commented on issue #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#issuecomment-571243137
The CouchDB build is broken on Windows; I need to debug that first before I can validate this change.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] janl commented on a change in pull request #2393:
fix(#2143): allow env var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
janl commented on a change in pull request #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#discussion_r363052322
##########
File path: rel/files/couchdb.cmd.in
##########
@@ -25,8 +25,9 @@ set EMU=beam
set PROGNAME=%~n0
set PATH=%PATH%;%COUCHDB_BIN_DIR%
-set COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
-set COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js"
+IF NOT DEFINED COUCHDB_QUERY_SERVER_JAVASCRIPT SET COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
Review comment:
Thanks!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] wohali commented on a change in pull request #2393:
fix(#2143): allow env var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
wohali commented on a change in pull request #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#discussion_r363049345
##########
File path: rel/files/couchdb.cmd.in
##########
@@ -25,8 +25,9 @@ set EMU=beam
set PROGNAME=%~n0
set PATH=%PATH%;%COUCHDB_BIN_DIR%
-set COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
-set COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js"
+IF NOT DEFINED COUCHDB_QUERY_SERVER_JAVASCRIPT SET COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
Review comment:
This should work but needs empirical validation, I can do this Monday
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] wohali commented on a change in pull request #2393:
fix(#2143): allow env var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
wohali commented on a change in pull request #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#discussion_r364413384
##########
File path: rel/files/couchdb.cmd.in
##########
@@ -25,8 +25,9 @@ set EMU=beam
set PROGNAME=%~n0
set PATH=%PATH%;%COUCHDB_BIN_DIR%
-set COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
-set COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js"
+IF NOT DEFINED COUCHDB_QUERY_SERVER_JAVASCRIPT SET COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
Review comment:
You need to remove the quotation marks:
```batch
IF NOT DEFINED COUCHDB_QUERY_SERVER_JAVASCRIPT SET COUCHDB_QUERY_SERVER_JAVASCRIPT={{prefix}}/bin/couchjs {{prefix}}/share/server/main.js
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] wohali merged pull request #2393: fix(#2143): allow env
var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
wohali merged pull request #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] wohali commented on issue #2393: fix(#2143): allow env
var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
wohali commented on issue #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#issuecomment-572232665
This will fix #2404.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] janl commented on issue #2393: fix(#2143): allow env var
overrides for js query server config
Posted by GitBox <gi...@apache.org>.
janl commented on issue #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#issuecomment-570814782
fixed in latest push
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] wohali commented on a change in pull request #2393:
fix(#2143): allow env var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
wohali commented on a change in pull request #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#discussion_r363049263
##########
File path: rel/files/couchdb.in
##########
@@ -26,8 +26,8 @@ export BINDIR="$ROOTDIR/erts-$ERTS_VSN/bin"
export EMU=beam
export PROGNAME=`echo $0 | sed 's/.*\///'`
-export COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
-export COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js"
+export COUCHDB_QUERY_SERVER_JAVASCRIPT=${COUCHDB_QUERY_SERVER_JAVASCRIPT:-{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
Review comment:
Unbalanced quotation marks
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] wohali edited a comment on issue #2393: fix(#2143): allow
env var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
wohali edited a comment on issue #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#issuecomment-571243137
The CouchDB build is broken on Windows; I need to debug that first before I can validate this change.
See https://github.com/apache/couchdb/issues/2404
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [couchdb] janl commented on a change in pull request #2393:
fix(#2143): allow env var overrides for js query server config
Posted by GitBox <gi...@apache.org>.
janl commented on a change in pull request #2393: fix(#2143): allow env var overrides for js query server config
URL: https://github.com/apache/couchdb/pull/2393#discussion_r363052309
##########
File path: rel/files/couchdb.in
##########
@@ -26,8 +26,8 @@ export BINDIR="$ROOTDIR/erts-$ERTS_VSN/bin"
export EMU=beam
export PROGNAME=`echo $0 | sed 's/.*\///'`
-export COUCHDB_QUERY_SERVER_JAVASCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
-export COUCHDB_QUERY_SERVER_COFFEESCRIPT="{{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js"
+export COUCHDB_QUERY_SERVER_JAVASCRIPT=${COUCHDB_QUERY_SERVER_JAVASCRIPT:-{{prefix}}/bin/couchjs {{prefix}}/share/server/main.js"
Review comment:
fixed
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services