Skip to content

Commit

Permalink
Merge 7f293fc into 142df54
Browse files Browse the repository at this point in the history
  • Loading branch information
ianchadwick committed Oct 13, 2017
2 parents 142df54 + 7f293fc commit 8ea634e
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions README.md
Expand Up @@ -57,7 +57,8 @@ var config = convict({
doc: "The port to bind.",
format: "port",
default: 8080,
env: "PORT"
env: "PORT",
arg: "port"
},
db: {
host: {
Expand Down Expand Up @@ -236,8 +237,8 @@ When merging configuration values from different sources, Convict follows preced

1. Default value
2. File (`config.loadFile()`)
3. Environment variables
4. Command line arguments
3. Environment variables (only if `env` property is set)
4. Command line arguments (only if `arg` property is set)
5. Set and load calls (`config.set()` and `config.load()`)


Expand Down

0 comments on commit 8ea634e

Please sign in to comment.