You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by rnewson <gi...@git.apache.org> on 2016/08/05 13:47:00 UTC
[GitHub] couchdb-config pull request #9: Consult default.d/local.d for ini files
GitHub user rnewson opened a pull request:
https://github.com/apache/couchdb-config/pull/9
Consult default.d/local.d for ini files
COUCHDB-3089
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/cloudant/couchdb-config 3089-default.d
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/couchdb-config/pull/9.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #9
----
commit 2679500e1bd9471dfdab55a12380e46bf668ef87
Author: Robert Newson <rn...@apache.org>
Date: 2016-08-05T13:25:05Z
Consult default.d/local.d for ini files
COUCHDB-3089
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-config issue #9: Consult default.d/local.d for ini files
Posted by davisp <gi...@git.apache.org>.
Github user davisp commented on the issue:
https://github.com/apache/couchdb-config/pull/9
+1 after adding the sort
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-config issue #9: Consult default.d/local.d for ini files
Posted by kxepal <gi...@git.apache.org>.
Github user kxepal commented on the issue:
https://github.com/apache/couchdb-config/pull/9
+1
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-config pull request #9: Consult default.d/local.d for ini files
Posted by rnewson <gi...@git.apache.org>.
Github user rnewson commented on a diff in the pull request:
https://github.com/apache/couchdb-config/pull/9#discussion_r73704223
--- Diff: src/config_app.erl ---
@@ -48,5 +49,18 @@ command_line() ->
default() ->
Etc = filename:join(code:root_dir(), "etc"),
- Default = [filename:join(Etc,"default.ini"), filename:join(Etc,"local.ini")],
+ Default = [
+ filename:join(Etc, "default.ini"),
+ filename:join(Etc, "default.d"),
+ filename:join(Etc, "local.ini"),
+ filename:join(Etc, "local.d")
+ ],
lists:filter(fun filelib:is_file/1, Default).
+
+expand_dirs(File) ->
+ case filelib:is_dir(File) of
+ true ->
+ filelib:wildcard(File ++ "/*.ini");
--- End diff --
the current code does a glob though, and no sort, so that would be a change, albeit a good one. still want the short?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-config pull request #9: Consult default.d/local.d for ini files
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/couchdb-config/pull/9
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb-config pull request #9: Consult default.d/local.d for ini files
Posted by davisp <gi...@git.apache.org>.
Github user davisp commented on a diff in the pull request:
https://github.com/apache/couchdb-config/pull/9#discussion_r73700693
--- Diff: src/config_app.erl ---
@@ -48,5 +49,18 @@ command_line() ->
default() ->
Etc = filename:join(code:root_dir(), "etc"),
- Default = [filename:join(Etc,"default.ini"), filename:join(Etc,"local.ini")],
+ Default = [
+ filename:join(Etc, "default.ini"),
+ filename:join(Etc, "default.d"),
+ filename:join(Etc, "local.ini"),
+ filename:join(Etc, "local.d")
+ ],
lists:filter(fun filelib:is_file/1, Default).
+
+expand_dirs(File) ->
+ case filelib:is_dir(File) of
+ true ->
+ filelib:wildcard(File ++ "/*.ini");
--- End diff --
You should add a sort here so that the order they're applied is defined.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---