Skip to content

Commit

Permalink
config_reader.c: change log messages for reading config files (#1247)
Browse files Browse the repository at this point in the history
  • Loading branch information
byshen authored Sep 20, 2020
1 parent 51f13b9 commit 5b1dbdb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
5 changes: 4 additions & 1 deletion cherokee/config_reader.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ do_include (cherokee_config_node_t *conf, cherokee_buffer_t *path)
int entry_len;

dir = cherokee_opendir (path->buf);
if (dir == NULL) return ret_error;
if (dir == NULL) {
LOG_CRITICAL (CHEROKEE_ERROR_CONF_OPEN_DIR, path->buf);
return ret_error;
}

while ((entry = readdir(dir)) != NULL) {
ret_t ret;
Expand Down
7 changes: 6 additions & 1 deletion cherokee/error_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,12 @@
#
e('CONF_READ_ACCESS_FILE',
title = "Could not access file",
desc = "The configuration file '%s' could not be accessed. Most probably the server user does not have enough permissions to read it.",
desc = "The configuration file '%s' could not be accessed. Most probably the server user does not have enough permissions to read it, or lacks search permission on the file path.",
show_bt = False)

e('CONF_OPEN_DIR',
title = "Could not open directory",
desc = "Could not open directory '%s'. Please check the server user and file permissions.",
show_bt = False)

e('CONF_READ_CHILDREN_SAME_NODE',
Expand Down

0 comments on commit 5b1dbdb

Please sign in to comment.