Skip to content

Commit 5b1dbdb

Browse files
authored
config_reader.c: change log messages for reading config files (#1247)
1 parent 51f13b9 commit 5b1dbdb

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

cherokee/config_reader.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ do_include (cherokee_config_node_t *conf, cherokee_buffer_t *path)
7575
int entry_len;
7676

7777
dir = cherokee_opendir (path->buf);
78-
if (dir == NULL) return ret_error;
78+
if (dir == NULL) {
79+
LOG_CRITICAL (CHEROKEE_ERROR_CONF_OPEN_DIR, path->buf);
80+
return ret_error;
81+
}
7982

8083
while ((entry = readdir(dir)) != NULL) {
8184
ret_t ret;

cherokee/error_list.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,12 @@
765765
#
766766
e('CONF_READ_ACCESS_FILE',
767767
title = "Could not access file",
768-
desc = "The configuration file '%s' could not be accessed. Most probably the server user does not have enough permissions to read it.",
768+
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.",
769+
show_bt = False)
770+
771+
e('CONF_OPEN_DIR',
772+
title = "Could not open directory",
773+
desc = "Could not open directory '%s'. Please check the server user and file permissions.",
769774
show_bt = False)
770775

771776
e('CONF_READ_CHILDREN_SAME_NODE',

0 commit comments

Comments
 (0)